Export _glib_get_locale_dir() as it is now used in gio, too

This commit is contained in:
Tor Lillqvist 2011-02-20 01:23:48 +02:00
parent 73af5ab4cf
commit 1158f9c171
4 changed files with 7 additions and 2 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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;