make client_reconfigure a non-user-type client_configure

[chaz/openbox] / openbox / prop.c

diff --git a/openbox/prop.c b/openbox/prop.c
index e708b9843df4709d8c326526361dfd6fa847bea7..44d0f2bf064c9aae0b76aa6b9702fc98d824e641 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -186,7 +186,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, int size,
                    ((guint16*)data)[i] = ((guint16*)xdata)[i];
                    break;
                case 32:
-                   ((guint32*)data)[i] = ((guint32*)xdata)[i];
+                   ((guint32*)data)[i] = ((gulong*)xdata)[i];
                    break;
                default:
                    g_assert_not_reached(); /* unhandled size */
@@ -225,7 +225,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, int size,
                    ((guint16*)*data)[i] = ((guint16*)xdata)[i];
                    break;
                case 32:
-                   ((guint32*)*data)[i] = ((guint32*)xdata)[i];
+                   ((guint32*)*data)[i] = ((gulong*)xdata)[i];
                    break;
                default:
                    g_assert_not_reached(); /* unhandled size */
@@ -294,7 +294,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
                 g_strfreev(*ret); /* free what we did so far */
                 break; /* the force is not strong with us */
             }
-            p = strchr(p, '\0');
+            p += strlen(p) + 1;
         }
        g_free(raw);
         if (i == num)
@@ -306,12 +306,17 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
 gboolean prop_get_string_utf8(Window win, Atom prop, char **ret)
 {
     char *raw;
+    char *str;
     guint num;
      
     if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
-       *ret = g_strndup(raw, num); /* grab the first string from the list */
+       str = g_strndup(raw, num); /* grab the first string from the list */
        g_free(raw);
-       return TRUE;
+        if (g_utf8_validate(str, -1, NULL)) {
+            *ret = str;
+            return TRUE;
+        }
+        g_free(str);
     }
     return FALSE;
 }
@@ -327,8 +332,11 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret)
 
         p = raw;
         for (i = 0; i < num; ++i) {
-            (*ret)[i] = g_strdup(p);
-            p = strchr(p, '\0');
+            if (g_utf8_validate(p, -1, NULL))
+                (*ret)[i] = g_strdup(p);
+            else
+                (*ret)[i] = g_strdup("");
+            p += strlen(p) + 1;
         }
        g_free(raw);
        return TRUE;