From 11c5d4f3391400987c8fa41ef6e67458c1c29260 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 29 Oct 2009 12:18:37 +0000
Subject: [PATCH] Fix all the keybindings showing up when using compiz

The wm_common_get_current_keybindings() implementation
was broken.

https://bugzilla.gnome.org/show_bug.cgi?id=600021
---
 capplets/common/wm-common.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/capplets/common/wm-common.c b/capplets/common/wm-common.c
index ef38489..d2ce82a 100644
--- a/capplets/common/wm-common.c
+++ b/capplets/common/wm-common.c
@@ -27,7 +27,7 @@ wm_common_get_window_manager_property (Atom atom)
   guchar *val;
 
   if (wm_window == None)
-    return g_strdup (WM_COMMON_UNKNOWN);
+    return NULL;
 
   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 ||
       !g_utf8_validate (val, nitems, NULL))
     {
-      retval = g_strdup (WM_COMMON_UNKNOWN);
+      retval = NULL;
     }
   else
     {
@@ -93,7 +93,7 @@ wm_common_get_current_keybindings (void)
       char *wm_name = wm_common_get_window_manager_property (wm_atom);
       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);
       g_free (wm_name);
-- 
1.6.5.1