[gnome-control-center] keyboard: drop hard X dependency

[Matthias Clasen <matthiasc src gnome org>]

commit cd498a06b3f0bd0ec17da449728755832f7ef2fd
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 21 15:33:37 2014 -0400

    keyboard: drop hard X dependency
    
    The code to listen for window manager changes only makes sense under
    X, so don't use it under Wayland. In that case, we can just assume
    that we are under GNOME shell when we find a wayland display.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728679

 panels/keyboard/keyboard-shortcuts.c |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index 239eaf6..ea0e04a 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -27,6 +27,10 @@
 #include "cc-keyboard-option.h"
 #include "wm-common.h"
 
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
 #define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"
 #define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
 #define CUSTOM_SHORTCUTS_ID "custom"
@@ -600,6 +604,7 @@ reload_sections (CcPanel *panel)
 {
   GtkBuilder *builder;
   gchar **wm_keybindings;
+  gchar *default_wm_keybindings[] = { "Mutter", "GNOME Shell", NULL };
   GDir *dir;
   GtkTreeModel *sort_model;
   GtkTreeModel *section_model;
@@ -646,7 +651,12 @@ reload_sections (CcPanel *panel)
                                             (GDestroyNotify) free_key_array);
 
   /* Load WM keybindings */
-  wm_keybindings = wm_common_get_current_keybindings ();
+#ifdef GDK_WINDOWING_X11
+  if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+    wm_keybindings = wm_common_get_current_keybindings ();
+#endif
+  else
+    wm_keybindings = g_strdupv (default_wm_keybindings);
 
   loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
@@ -1842,8 +1852,11 @@ void
 keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder)
 {
   g_object_set_data (G_OBJECT (panel), "builder", builder);
-  wm_common_register_window_manager_change ((GFunc) on_window_manager_change,
-                                            panel);
+#ifdef GDK_WINDOWING_X11
+  if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+    wm_common_register_window_manager_change ((GFunc) on_window_manager_change,
+                                              panel);
+#endif
   pictures_regex = g_regex_new ("\\$PICTURES", 0, 0, NULL);
   setup_dialog (panel, builder);
   reload_sections (panel);