From: Hans Breuer <hans@breuer.org>
Date: Fri, 13 Jun 2008 08:05:33 +0000 (+0000)
Subject: to get the default translation target on win32 use g_win32_get_locale()
X-Git-Tag: GLIB_2_17_3~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43eeb244acbfc6cbc0b9dc4623aa9bcb888275ff;p=platform%2Fupstream%2Fglib.git

to get the default translation target on win32 use g_win32_get_locale()

2008-06-13  Hans Breuer  <hans@breuer.org>

	* glib/gstrfuncs.c : to get the default translation target on
	win32 use g_win32_get_locale() instead of setlocale(LS_MESSAGES,NULL)
	Fixes bug #538044

	* glib/makefile.msc.in gio/makefile.msc : updated

svn path=/trunk/; revision=7036
---

diff --git a/ChangeLog b/ChangeLog
index e360c26..7b1ec03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gstrfuncs.c : to get the default translation target on
+	win32 use g_win32_get_locale() instead of setlocale(LS_MESSAGES,NULL)
+	Fixes bug #538044
+
+	* glib/makefile.msc.in gio/makefile.msc : updated
+
 2008-06-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/gio/makefile.msc b/gio/makefile.msc
index fb3278f..af618dc 100644
--- a/gio/makefile.msc
+++ b/gio/makefile.msc
@@ -129,7 +129,8 @@ OBJECTS = \
 	glocaldirectorymonitor.obj \
 	gwin32appinfo.obj \
 	\
-	gio-marshal.obj
+	gio-marshal.obj \
+	gwin32directorymonitor.obj
 
 libgio_2_0_la_LIBADD = \
 	$(top_builddir)/glib/libglib-2.0.la \
@@ -248,6 +249,8 @@ gio.def: gio.symbols
 		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gio.symbols >> gio.def
 
+gwin32directorymonitor.obj : win32\gwin32directorymonitor.c 
+	$(CC) $(CFLAGS) -I win32 -c win32\gwin32directorymonitor.c
 
 RESOURCE = $(PACKAGE).res
 
@@ -255,7 +258,7 @@ libgio-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
 	$(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER).dll $(OBJECTS) \
 	..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \
 	$(INTL_LIBS) \
-	user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) \
+	kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) \
 	/implib:gio-2.0.lib /def:$(PACKAGE).def
 
 .c.obj :
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 52595f3..e9c9e31 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -2922,8 +2922,11 @@ _g_dgettext_should_translate (void)
 
       const char *default_domain     = textdomain (NULL);
       const char *translator_comment = gettext ("");
+#ifndef G_OS_WIN32
       const char *translate_locale   = setlocale (LC_MESSAGES, NULL);
-
+#else
+      const char *translate_locale   = g_win32_getlocale ();
+#endif
       /* We should NOT translate only if all the following hold:
        *   - user has called textdomain() and set textdomain to non-default
        *   - default domain has no translations
diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index baf3fbd..ebaeff3 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -51,7 +51,6 @@ glib_OBJECTS =			\
 	gfileutils.obj		\
 	ghash.obj		\
 	ghook.obj		\
-	gi18n.obj	\
 	giochannel.obj		\
 	giowin32.obj		\
 	gkeyfile.obj		\