M obt/prop.c → obt/prop.c

@@ -414,7 +414,7 @@ gchar const *s[2] = { val, NULL };
     obt_prop_set_strings_locale(win, prop, s);
 }
 
-void obt_prop_set_strings_locale(Window win, Atom prop, gchar const **strs)
+void obt_prop_set_strings_locale(Window win, Atom prop, const gchar **strs)
 {
     gint i, count;
     gchar **lstrs;
@@ -444,7 +444,7 @@ XChangeProperty(obt_display, win, prop, OBT_PROP_ATOM(UTF8), 8,
                     PropModeReplace, (const guchar*)val, strlen(val));
 }
 
-void obt_prop_set_strings_utf8(Window win, Atom prop, gchar const **strs)
+void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs)
 {
     GString *str;
     gchar const **s;

M obt/prop.h → obt/prop.h

@@ -225,8 +225,8 @@ void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
                           guint num);
 void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val);
 void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val);
-void obt_prop_set_strings_locale(Window win, Atom prop, gchar const **strs);
-void obt_prop_set_strings_utf8(Window win, Atom prop, gchar const **strs);
+void obt_prop_set_strings_locale(Window win, Atom prop, const gchar **strs);
+void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs);
 
 void obt_prop_erase(Window win, Atom prop);
 

M openbox/screen.c → openbox/screen.c

@@ -385,7 +385,7 @@ names[i] = g_strdup(it->data);
 
         /* set the root window property */
         OBT_PROP_SETSS(RootWindow(obt_display, ob_screen),
-                       NET_DESKTOP_NAMES, utf8, names);
+                       NET_DESKTOP_NAMES, utf8, (const gchar**)names);
 
         g_strfreev(names);
     }
@@ -1162,7 +1162,7 @@ 
         /* if we changed any names, then set the root property so we can
            all agree on the names */
         OBT_PROP_SETSS(RootWindow(obt_display, ob_screen), NET_DESKTOP_NAMES,
-                       utf8, screen_desktop_names);
+                       utf8, (const gchar**)screen_desktop_names);
     }
 
     /* resize the pager for these names */