goffice r2070 - in trunk: . goffice/utils

[jody svn gnome org]

Author: jody
Date: Sat May  3 00:43:53 2008
New Revision: 2070
URL: http://svn.gnome.org/viewvc/goffice?rev=2070&view=rev

Log:
2008-05-02  Jody Goldberg <jody gnome org>

	* goffice/utils/go-locale.c (go_locale_win32_get_user_default) : fix
	  typo on win32 that always set lc_date_format, and never
	  lc_time_format.
	(go_locale_get_time_format): ditto.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/goffice/utils/go-locale.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat May  3 00:43:53 2008
@@ -9,6 +9,7 @@
 
 Jody:
 	* Enable the use of dolt.
+	* Fix formats on win32.
 
 Morten:
 	* Add go_format_is_invalid.

Modified: trunk/goffice/utils/go-locale.c
==============================================================================
--- trunk/goffice/utils/go-locale.c	(original)
+++ trunk/goffice/utils/go-locale.c	Sat May  3 00:43:53 2008
@@ -186,7 +186,7 @@
 	char *fmt_utf8 = g_convert ((gchar *)fmt_utf16, utf16_len*2,
 		 "UTF-8", "UTF-16LE", NULL, &utf8_len, &error);
 	if (NULL != fmt_utf8)
-		g_string_append_len (lc_date_format, fmt_utf8, utf8_len);
+		g_string_append_len (res, fmt_utf8, utf8_len);
 	else if (NULL != error) {
 		g_warning ("error: %s", error->message);
 		g_error_free (error);
@@ -273,7 +273,7 @@
 			lc_time_format = g_string_new (NULL);
 
 #if defined(G_OS_WIN32)
-		go_locale_win32_get_user_default (lc_date_format, LOCALE_STIME);
+		go_locale_win32_get_user_default (lc_time_format, LOCALE_STIME);
 #elif defined(HAVE_LANGINFO_H)
 		{
 			char const *fmt = nl_langinfo (T_FMT);