[uim] r6880 committed - * Merge r6879 from trunk.

[codesite-noreply]

Revision: 6880
Author: ek.kato
Date: Sat Jan  1 06:30:20 2011
Log: * Merge r6879 from trunk.

http://code.google.com/p/uim/source/detail?r=6880

Modified:
 /branches/1.6/gtk/compose.c

=======================================
--- /branches/1.6/gtk/compose.c Sun Jun 20 00:04:11 2010
+++ /branches/1.6/gtk/compose.c Sat Jan  1 06:30:20 2011
@@ -621,7 +621,10 @@
     {
        char *result;
        result = g_locale_to_utf8(rhs_string_mb, -1, NULL, NULL, NULL);
-       rhs_string_utf8 = strdup(result);
+       if (!result)
+           rhs_string_utf8 = strdup("");
+       else
+           rhs_string_utf8 = strdup(result);
        g_free(result);
     }