applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix all the keybindings showing up when using compiz

Browse source 
The wm_common_get_current_keybindings() implementation
was broken.

https://bugzilla.gnome.org/show_bug.cgi?id=600021
This commit is contained in:
Bastien Nocera 2009-10-29 12:18:37 +00:00
parent 51a283edd0
commit 3a3b2f99e1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/common/wm-common.c
View file

@ -27,7 +27,7 @@ wm_common_get_window_manager_property (Atom atom)
guchar *val; guchar *val;
if (wm_window == None) if (wm_window == None)
return g_strdup (WM_COMMON_UNKNOWN); return NULL;
utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False); utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
@ -46,7 +46,7 @@ wm_common_get_window_manager_property (Atom atom)
type != utf8_string || format != 8 || nitems == 0 || type != utf8_string || format != 8 || nitems == 0 ||
!g_utf8_validate (val, nitems, NULL)) !g_utf8_validate (val, nitems, NULL))
{ {
retval = g_strdup (WM_COMMON_UNKNOWN); retval = NULL;
} }
else else
{ {
@ -93,7 +93,7 @@ wm_common_get_current_keybindings (void)
char *wm_name = wm_common_get_window_manager_property (wm_atom); char *wm_name = wm_common_get_window_manager_property (wm_atom);
char *to_copy[] = { NULL, NULL }; char *to_copy[] = { NULL, NULL };
to_copy[0] = wm_name; to_copy[0] = wm_name ? wm_name : g_strdup (WM_COMMON_UNKNOWN);
results = g_strdupv (to_copy); results = g_strdupv (to_copy);
g_free (wm_name); g_free (wm_name);