From: Dana Jansens <danakj@orodu.net>
Date: Mon, 17 May 2010 23:04:06 +0000 (-0400)
Subject: avoid new gcc warning (casting ** to const** is not valid for good reason)
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=545061829795ad5c5f07f2b2607d42b3e695ed15;p=chaz%2Fopenbox

avoid new gcc warning (casting ** to const** is not valid for good reason)
---

diff --git a/obt/prop.c b/obt/prop.c
index ae229e42..bef9c999 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -426,7 +426,8 @@ 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, const gchar **strs)
+void obt_prop_set_strings_locale(Window win, Atom prop,
+                                 const gchar *const *strs)
 {
     gint i, count;
     gchar **lstrs;
@@ -456,10 +457,11 @@ 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, const gchar **strs)
+void obt_prop_set_strings_utf8(Window win, Atom prop,
+                               const gchar *const *strs)
 {
     GString *str;
-    gchar const **s;
+    gchar const *const *s;
 
     str = g_string_sized_new(0);
     for (s = strs; *s; ++s) {
diff --git a/obt/prop.h b/obt/prop.h
index cc1fe736..7ccc218e 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -236,8 +236,10 @@ 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, const gchar **strs);
-void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs);
+void obt_prop_set_strings_locale(Window win, Atom prop,
+                                 const gchar *const *strs);
+void obt_prop_set_strings_utf8(Window win, Atom prop,
+                               const gchar *const *strs);
 
 void obt_prop_erase(Window win, Atom prop);
 
diff --git a/openbox/screen.c b/openbox/screen.c
index 4b91a6dd..47ecc183 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -396,7 +396,7 @@ void screen_startup(gboolean reconfig)
 
         /* set the root window property */
         OBT_PROP_SETSS(obt_root(ob_screen),
-                       NET_DESKTOP_NAMES, utf8, (const gchar**)names);
+                       NET_DESKTOP_NAMES, utf8, (const gchar*const*)names);
 
         g_strfreev(names);
     }
@@ -1206,7 +1206,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(obt_root(ob_screen), NET_DESKTOP_NAMES,
-                       utf8, (const gchar**)screen_desktop_names);
+                       utf8, (const gchar*const*)screen_desktop_names);
     }
 
     /* resize the pager for these names */