Add in the new symbols

2007-11-28  Alexander Larsson  <alexl@redhat.com>

        * glib/glib.symbols:
	Add in the new symbols

        * glib/gurifuncs.c:
	Use the aliases framework

        * glib/glibintl.h:
        * glib/gutils.c:
	Make the alias stuff work now that glib_gettext
	is exported to libgio.

svn path=/trunk/; revision=5973

diff --git a/ChangeLog b/ChangeLog
index 7819d2f543185a161fb85aa1562b616d4ce183b9..99648040cf19ad4699a6c43d7bcad6f2fb62d73b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-11-28  Alexander Larsson  <alexl@redhat.com>
+
+        * glib/glib.symbols:
+       Add in the new symbols
+       
+        * glib/gurifuncs.c:
+       Use the aliases framework
+       
+        * glib/glibintl.h:
+        * glib/gutils.c:
+       Make the alias stuff work now that glib_gettext
+       is exported to libgio. 
+
 2007-11-27  Ryan Lortie  <desrt@desrt.ca>
 
        * glib/ghash.c (g_hash_table_insert, g_hash_table_replace,

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 64b59de57250d7e9947a575cf9e1cf5d47bb3aee..28fa1ba1d8a1b5c2a5bb67847d05f0ca19cd41b0 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -338,6 +338,7 @@ g_file_set_contents
 g_file_open_tmp PRIVATE
 g_file_test PRIVATE
 g_file_read_link
+g_format_file_size_for_display
 g_mkstemp PRIVATE
 g_mkdir_with_parents
 #ifdef G_OS_WIN32
@@ -1126,6 +1127,15 @@ g_dpgettext
 #endif
 #endif
 
+#if IN_HEADER(__G_URI_FUNCS_H__)
+#if IN_FILE(__G_URI_FUNCS_C__)
+g_uri_unescape_string 
+g_uri_unescape_segment 
+g_uri_get_scheme 
+g_uri_escape_string 
+#endif
+#endif
+
 #if IN_HEADER(__G_STRING_H__)
 #if IN_FILE(__G_STRING_C__)
 g_string_append
@@ -1162,6 +1172,7 @@ g_string_printf G_GNUC_PRINTF(2,3)
 g_string_set_size
 g_string_sized_new
 g_string_truncate
+g_string_append_uri_escaped
 #ifndef G_DISABLE_DEPRECATED
 g_string_down
 g_string_up
@@ -1409,6 +1420,13 @@ g_unichar_validate
 #endif
 #endif
 
+
+#if IN_HEADER(__GLIBINTL_H__)
+#if IN_FILE(__G_UTILS_C__)
+glib_gettext
+#endif
+#endif
+
 #if IN_HEADER(__G_HASH_H__)
 #if IN_FILE(__G_UTILS_C__)
 g_int_equal
@@ -1557,4 +1575,3 @@ glib_minor_version
 glib_on_error_halt
 g_mem_gc_friendly
 #endif
-

diff --git a/glib/glibintl.h b/glib/glibintl.h
index f540edfe86446f1ff7c8bcc77289066e1f3b1225..8e6cdf08246a1ec2a85ec46bbad0512c6524b4b5 100644 (file)
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -5,9 +5,9 @@
 #error "config.h must be included prior to glibintl.h"
 #endif
 
-#ifdef ENABLE_NLS
+G_CONST_RETURN gchar *glib_gettext (const gchar *str);
 
-gchar *glib_gettext (const gchar *str);
+#ifdef ENABLE_NLS
 
 #include <libintl.h>
 #define _(String) glib_gettext(String)

diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c
index 150f3667de388a6afc4cc70d82ab373fa78aea6f..731dc6d9053e41130b44a0b682a8fb797f097db3 100644 (file)
--- a/glib/gurifuncs.c
+++ b/glib/gurifuncs.c
@@ -24,6 +24,8 @@
 #include "gurifuncs.h"
 #include "string.h"
 
+#include "galias.h"
+
 /**
  * SECTION:gurifuncs
  * @short_description: URI Functions
@@ -217,3 +219,6 @@ g_uri_escape_string (const char *unescaped,
   
   return g_string_free (s, FALSE);
 }
+
+#define __G_URI_FUNCS_C__
+#include "galiasdef.c"

diff --git a/glib/gutils.c b/glib/gutils.c
index eb07def8658f8400f68109e18f0a35196e99b77a..9da0941d9d5c2eb02dbc913b4ea668d13a128917 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -61,6 +61,7 @@
 #include "glib.h"
 #include "gprintfint.h"
 #include "gthreadprivate.h"
+#include "glibintl.h"
 #include "galias.h"
 
 #ifdef MAXPATHLEN