revert r6029, as it didnt fix anything.

[chaz/openbox] / openbox / prop.c

diff --git a/openbox/prop.c b/openbox/prop.c
index d13a0515c8bf581c50e28cb36cb2d57dcfb54f22..225198730ff620d71f9e040cfc844f0aa879471e 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -302,8 +302,7 @@ gboolean prop_get_string_locale(Window win, Atom prop, gchar **ret)
     gchar *s;
 
     if (get_stringlist(win, prop, &list, &nstr) && nstr) {
-        s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
-                      NULL, NULL, NULL);
+        s = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL);
         XFreeStringList(list);
         if (s) {
             *ret = s;
@@ -332,8 +331,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret)
         (*ret)[count] = NULL; /* null terminated list */
 
         for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
-            (*ret)[i] = g_convert(it->data, -1, "UTF-8", "ISO-8859-1",
-                                  NULL, NULL, NULL);
+            (*ret)[i] = g_locale_to_utf8(it->data, -1, NULL, NULL, NULL);
             /* make sure translation did not fail */
             if (!(*ret)[i])
                 (*ret)[i] = g_strdup("");
@@ -445,6 +443,7 @@ void prop_message(Window about, Atom messagetype, glong data0, glong data1,
     ce.xclient.data.l[1] = data1;
     ce.xclient.data.l[2] = data2;
     ce.xclient.data.l[3] = data3;
+    ce.xclient.data.l[4] = 0;
     XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE,
                mask, &ce);
 }