[glib] Export _glib_get_locale_dir() as it is now used in gio, too
- From: Tor Lillqvist <tml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Export _glib_get_locale_dir() as it is now used in gio, too
- Date: Sat, 19 Feb 2011 23:34:55 +0000 (UTC)
commit 1158f9c171682e2ce30c1e790fe809dbb9926277
Author: Tor Lillqvist <tml iki fi>
Date: Sun Feb 20 01:23:48 2011 +0200
Export _glib_get_locale_dir() as it is now used in gio, too
gio/gdbus-tool.c | 1 +
gio/glib-compile-schemas.c | 3 ++-
glib/glib.symbols | 3 +++
glib/gutils.c | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c
index 9c6ff44..56efd40 100644
--- a/gio/gdbus-tool.c
+++ b/gio/gdbus-tool.c
@@ -1653,6 +1653,7 @@ main (gint argc, gchar *argv[])
textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32
+ extern gchar *_glib_get_locale_dir (void);
gchar *tmp = _glib_get_locale_dir ();
bindtextdomain (GETTEXT_PACKAGE, tmp);
g_free (tmp);
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 175d756..1bf9c21 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -1907,7 +1907,8 @@ main (int argc, char **argv)
setlocale (LC_ALL, "");
textdomain (GETTEXT_PACKAGE);
- #ifdef G_OS_WIN32
+#ifdef G_OS_WIN32
+ extern gchar *_glib_get_locale_dir (void);
gchar *tmp = _glib_get_locale_dir ();
bindtextdomain (GETTEXT_PACKAGE, tmp);
g_free (tmp);
diff --git a/glib/glib.symbols b/glib/glib.symbols
index 4591ecd..6815ec4 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1608,6 +1608,9 @@ g_unichar_validate
#if IN_HEADER(__GLIBINTL_H__)
#if IN_FILE(__G_UTILS_C__)
glib_gettext G_GNUC_FORMAT(1)
+#ifdef G_OS_WIN32
+_glib_get_locale_dir
+#endif
#endif
#endif
diff --git a/glib/gutils.c b/glib/gutils.c
index 4288bc6..5bea93f 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -3572,7 +3572,7 @@ _g_utils_thread_init (void)
* have to use system codepage as bindtextdomain() doesn't have a
* UTF-8 interface.
*/
-static gchar *
+gchar *
_glib_get_locale_dir (void)
{
gchar *install_dir = NULL, *locale_dir;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]