glib r7036 - in trunk: . gio glib

[hans svn gnome org]

Author: hans
Date: Fri Jun 13 08:05:33 2008
New Revision: 7036
URL: http://svn.gnome.org/viewvc/glib?rev=7036&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/gio/makefile.msc
   trunk/glib/gstrfuncs.c
   trunk/glib/makefile.msc.in

Modified: trunk/gio/makefile.msc
==============================================================================
--- trunk/gio/makefile.msc	(original)
+++ trunk/gio/makefile.msc	Fri Jun 13 08:05:33 2008
@@ -129,7 +129,8 @@
 	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 @@
 		-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 @@
 	$(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 :

Modified: trunk/glib/gstrfuncs.c
==============================================================================
--- trunk/glib/gstrfuncs.c	(original)
+++ trunk/glib/gstrfuncs.c	Fri Jun 13 08:05:33 2008
@@ -2922,8 +2922,11 @@
 
       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

Modified: trunk/glib/makefile.msc.in
==============================================================================
--- trunk/glib/makefile.msc.in	(original)
+++ trunk/glib/makefile.msc.in	Fri Jun 13 08:05:33 2008
@@ -51,7 +51,6 @@
 	gfileutils.obj		\
 	ghash.obj		\
 	ghook.obj		\
-	gi18n.obj	\
 	giochannel.obj		\
 	giowin32.obj		\
 	gkeyfile.obj		\