Blame no-duplicate-keybindings-dammit.patch
|
 |
3797199 |
--- gnome-control-center-2.28.1/capplets/common/wm-common.c 2009-09-21 06:44:55.000000000 -0400
|
|
|
3797199 |
+++ hacked/capplets/common/wm-common.c 2009-12-08 21:31:52.318541572 -0500
|
|
|
3797199 |
@@ -27,7 +27,7 @@
|
|
|
3797199 |
guchar *val;
|
|
|
3797199 |
|
|
|
3797199 |
if (wm_window == None)
|
|
|
3797199 |
- return g_strdup (WM_COMMON_UNKNOWN);
|
|
|
3797199 |
+ return NULL;
|
|
|
3797199 |
|
|
|
3797199 |
utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
|
|
|
3797199 |
|
|
|
3797199 |
@@ -46,7 +46,7 @@
|
|
|
3797199 |
type != utf8_string || format != 8 || nitems == 0 ||
|
|
|
3797199 |
!g_utf8_validate (val, nitems, NULL))
|
|
|
3797199 |
{
|
|
|
3797199 |
- retval = g_strdup (WM_COMMON_UNKNOWN);
|
|
|
3797199 |
+ retval = NULL;
|
|
|
3797199 |
}
|
|
|
3797199 |
else
|
|
|
3797199 |
{
|
|
|
3797199 |
@@ -93,7 +93,7 @@
|
|
|
3797199 |
char *wm_name = wm_common_get_window_manager_property (wm_atom);
|
|
|
3797199 |
char *to_copy[] = { NULL, NULL };
|
|
|
3797199 |
|
|
|
3797199 |
- to_copy[0] = wm_name;
|
|
|
3797199 |
+ to_copy[0] = wm_name ? wm_name : WM_COMMON_UNKNOWN;
|
|
|
3797199 |
|
|
|
3797199 |
results = g_strdupv (to_copy);
|
|
|
3797199 |
g_free (wm_name);
|