nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dana Jansens 2010-05-17 19:04:06 -04:00
parent 4463bb6e2f
commit 5450618297
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
obt/prop.c
View file

@ -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); 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; gint i, count;
gchar **lstrs; 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)); 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; GString *str;
gchar const **s; gchar const *const *s;
str = g_string_sized_new(0); str = g_string_sized_new(0);
for (s = strs; *s; ++s) { for (s = strs; *s; ++s) {

6
obt/prop.h
View file

@ -236,8 +236,10 @@ void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
guint num); guint num);
void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val); 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_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_locale(Window win, Atom prop,
void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs); 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); void obt_prop_erase(Window win, Atom prop);

4
openbox/screen.c
View file

@ -396,7 +396,7 @@ void screen_startup(gboolean reconfig)
/* set the root window property */ /* set the root window property */
OBT_PROP_SETSS(obt_root(ob_screen), 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); 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 /* if we changed any names, then set the root property so we can
all agree on the names */ all agree on the names */
OBT_PROP_SETSS(obt_root(ob_screen), NET_DESKTOP_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 */ /* resize the pager for these names */