2 files changed, 59 insertions, 1 deletions
diff --git a/capplets/common/mate-theme-apply.c b/capplets/common/mate-theme-apply.c
index 48b40bc0..77682cdf 100644
--- a/capplets/common/mate-theme-apply.c
+++ b/capplets/common/mate-theme-apply.c
@@ -26,8 +26,10 @@
 #include <libmate-desktop/mate-gsettings.h>
 #include "mate-theme-apply.h"
 #include "gtkrc-utils.h"
+#include <gdk/gdkx.h>
 
 #define INTERFACE_SCHEMA "org.mate.interface"
+#define INTERFACE_GNOME_SCHEMA "org.gnome.desktop.interface"
 #define GTK_THEME_KEY "gtk-theme"
 #define COLOR_SCHEME_KEY "gtk-color-scheme"
 #define ICON_THEME_KEY "icon-theme"
@@ -48,12 +50,27 @@ void
 mate_meta_theme_set (MateThemeMetaInfo *meta_theme_info)
 {
 GSettings *interface_settings;
+ GSettings *interface_gnome_settings = NULL;
 GSettings *marco_settings;
 GSettings *mouse_settings;
 GSettings *notification_settings = NULL;
 gchar *old_key;
 gint old_key_int;
 
+ /*Load the gnome interface schema if we are running under wayland and it is present*/
+ if (!(GDK_IS_X11_DISPLAY (gdk_display_get_default())))
+ {
+ GSettingsSchemaSource *source = g_settings_schema_source_get_default ();
+
+ if (source)
+ {
+ GSettingsSchema *schema = g_settings_schema_source_lookup (source, INTERFACE_GNOME_SCHEMA, TRUE);
+
+ if (schema)
+ interface_gnome_settings = g_settings_new_full (schema, NULL, NULL);
+ }
+ }
+
 interface_settings = g_settings_new (INTERFACE_SCHEMA);
 marco_settings = g_settings_new (MARCO_SCHEMA);
 mouse_settings = g_settings_new (MOUSE_SCHEMA);
@@ -68,6 +85,11 @@ mate_meta_theme_set (MateThemeMetaInfo *meta_theme_info)
 if (compare (old_key, meta_theme_info->gtk_theme_name))
 {
 g_settings_set_string (interface_settings, GTK_THEME_KEY, meta_theme_info->gtk_theme_name);
+
+ if (interface_gnome_settings)
+ g_settings_set_string (interface_gnome_settings, 
+ GTK_THEME_KEY, meta_theme_info->gtk_theme_name);
+
 }
 g_free (old_key);
 
@@ -97,12 +119,17 @@ mate_meta_theme_set (MateThemeMetaInfo *meta_theme_info)
 
 /* Set the wm key */
 g_settings_set_string (marco_settings, MARCO_THEME_KEY, meta_theme_info->marco_theme_name);
+ /*To also control decoration theme in wayland we need a decorator that uses marco themes
+ *and queries gsettings to determine which theme to use to this is a TODO */
 
 /* set the icon theme */
 old_key = g_settings_get_string (interface_settings, ICON_THEME_KEY);
 if (compare (old_key, meta_theme_info->icon_theme_name))
 {
 g_settings_set_string (interface_settings, ICON_THEME_KEY, meta_theme_info->icon_theme_name);
+ if (interface_gnome_settings)
+ g_settings_set_string (interface_gnome_settings,
+ ICON_THEME_KEY, meta_theme_info->icon_theme_name);
 }
 g_free (old_key);
 
@@ -125,6 +152,12 @@ mate_meta_theme_set (MateThemeMetaInfo *meta_theme_info)
 if (compare (old_key, meta_theme_info->cursor_theme_name))
 {
 g_settings_set_string (mouse_settings, CURSOR_THEME_KEY, meta_theme_info->cursor_theme_name);
+ if (interface_gnome_settings)
+ {
+ /*Note that this key is in a different place in GNOME than it is in MATE*/
+ g_settings_set_string (interface_gnome_settings,
+ CURSOR_THEME_KEY, meta_theme_info->cursor_theme_name);
+ }
 }
 
 old_key_int = g_settings_get_int (mouse_settings, CURSOR_SIZE_KEY);
diff --git a/capplets/common/wm-common.c b/capplets/common/wm-common.c
index a8a31bcb..3030c071 100644
--- a/capplets/common/wm-common.c
+++ b/capplets/common/wm-common.c
@@ -30,9 +30,12 @@ wm_common_get_window_manager_property (Atom atom)
 if (wm_window == None)
 return NULL;
 
+ display = gdk_display_get_default ();
+ if (!(GDK_IS_X11_DISPLAY (display)))
+ return NULL;
+
 utf8_string = gdk_x11_get_xatom_by_name ("UTF8_STRING");
 
- display = gdk_display_get_default ();
 gdk_x11_display_error_trap_push (display);
 
 val = NULL;
@@ -64,6 +67,9 @@ wm_common_get_window_manager_property (Atom atom)
 char*
 wm_common_get_current_window_manager (void)
 {
+ if (!(GDK_IS_X11_DISPLAY (gdk_display_get_default())))
+ return g_strdup (WM_COMMON_UNKNOWN);
+
 Atom atom = gdk_x11_get_xatom_by_name ("_NET_WM_NAME");
 char *result;
 
@@ -77,6 +83,15 @@ wm_common_get_current_window_manager (void)
 char**
 wm_common_get_current_keybindings (void)
 {
+
+ if (!(GDK_IS_X11_DISPLAY (gdk_display_get_default())))
+ {
+ /*This should never reached in wayland as compositors control
+ *and limit keybindings
+ */
+ return NULL;
+ }
+
 Atom keybindings_atom = gdk_x11_get_xatom_by_name ("_MATE_WM_KEYBINDINGS");
 char *keybindings = wm_common_get_window_manager_property (keybindings_atom);
 char **results;
@@ -115,6 +130,10 @@ update_wm_window (void)
 gulong bytes_after;
 
 display = gdk_display_get_default ();
+
+ if (!(GDK_IS_X11_DISPLAY (display)))
+ return;
+
 XGetWindowProperty (GDK_DISPLAY_XDISPLAY(display), GDK_ROOT_WINDOW (),
 gdk_x11_get_xatom_by_name ("_NET_SUPPORTING_WM_CHECK"),
 0, G_MAXLONG, False, XA_WINDOW, &type, &format,
@@ -146,6 +165,9 @@ wm_window_event_filter (GdkXEvent *xev,
 GdkEvent *event,
 gpointer data)
 {
+ if (!(GDK_IS_X11_DISPLAY (gdk_display_get_default())))
+ return GDK_FILTER_CONTINUE;
+
 WMCallbackData *ncb_data = (WMCallbackData*) data;
 XEvent *xevent = (XEvent *)xev;
 
@@ -172,6 +194,9 @@ wm_common_register_window_manager_change (GFunc func,
 {
 WMCallbackData *ncb_data;
 
+ if (!(GDK_IS_X11_DISPLAY (gdk_display_get_default())))
+ return;
+
 ncb_data = g_new0 (WMCallbackData, 1);
 
 ncb_data->func = func;