avoid new gcc warning (casting ** to const** is not valid for good reason)
Dana Jansens danakj@orodu.net
3 files changed,
11 insertions(+),
7 deletions(-)
M
obt/prop.c
→
obt/prop.c
@@ -426,7 +426,8 @@ gchar const *s[2] = { val, NULL };
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 @@ 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, 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) {
M
obt/prop.h
→
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);
M
openbox/screen.c
→
openbox/screen.c
@@ -396,7 +396,7 @@ names[i] = g_strdup(it->data);
/* 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 @@
/* 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 */