fix constness

diff --git a/obt/prop.c b/obt/prop.c
index 0a9131adcb747ca1c6400ac866d30b6b37d4c1cd..7beb9a91f6fb0981cc908ff5b7d8c432b1c3afc8 100644 (file)
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -414,7 +414,7 @@ void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val)
     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 @@ void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val)
                     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;

diff --git a/obt/prop.h b/obt/prop.h
index 7dfa90f625890380d87b38a45cb2868b21856529..55a36793df00db218dcedec2d879d6ac8f9050f2 100644 (file)
--- a/obt/prop.h
+++ b/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);
 

diff --git a/openbox/screen.c b/openbox/screen.c
index d8c22fd41e47c1b8964ca6e4004c3408c1c6bba5..ef98446b7163d713407c95a0dd5d3ad30c5f7035 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -385,7 +385,7 @@ void screen_startup(gboolean reconfig)
 
         /* 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 @@ void screen_update_desktop_names(void)
         /* 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 */