From 6ae887bb9b98659e3b0d4156fba0de92751a2eff Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 28 Nov 2007 14:35:14 +0000 Subject: [PATCH 1/1] Add in the new symbols 2007-11-28 Alexander Larsson * 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 --- ChangeLog | 13 +++++++++++++ glib/glib.symbols | 19 ++++++++++++++++++- glib/glibintl.h | 4 ++-- glib/gurifuncs.c | 5 +++++ glib/gutils.c | 1 + 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7819d2f..9964804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-11-28 Alexander Larsson + + * 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 * glib/ghash.c (g_hash_table_insert, g_hash_table_replace, diff --git a/glib/glib.symbols b/glib/glib.symbols index 64b59de..28fa1ba 100644 --- 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 f540edf..8e6cdf0 100644 --- 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 #define _(String) glib_gettext(String) diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c index 150f366..731dc6d 100644 --- 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 eb07def..9da0941 100644 --- 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 -- 2.7.4