SF.net SVN: geany:[3269] trunk/src/utils.c

[eht16 at users.sourceforge.net]

Revision: 3269
          http://geany.svn.sourceforge.net/geany/?rev=3269&view=rev
Author:   eht16
Date:     2008-11-21 18:32:41 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
Fix for r3267

Modified Paths:
--------------
    trunk/src/utils.c

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2008-11-21 18:19:36 UTC (rev 3268)
+++ trunk/src/utils.c	2008-11-21 18:32:41 UTC (rev 3269)
@@ -574,9 +574,14 @@
 
 	g_return_val_if_fail(format != NULL, NULL);
 
-	locale_format = g_locale_from_utf8(format, -1, NULL, NULL, NULL);
-	if (locale_format == NULL)
-		return NULL;
+	if (! g_utf8_validate(format, -1, NULL))
+	{
+		locale_format = g_locale_from_utf8(format, -1, NULL, NULL, NULL);
+		if (locale_format == NULL)
+			return NULL;
+	}
+	else
+		locale_format = g_strdup(format);
 
 	if (time_to_use != NULL)
 		tm = localtime(time_to_use);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.