diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | capplets/appearance/appearance-style.c | 46 |
2 files changed, 50 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a8dc5a32..95209182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,8 @@ notifications: deploy: - provider: pages - edge: true + edge: + branch: v2.0.3-beta.4 token: $GITHUB_TOKEN keep_history: false committer_from_gh: true @@ -51,7 +52,8 @@ deploy: all_branches: true condition: ${DISTRO} =~ ^fedora.*$ - provider: script - edge: true + edge: + branch: v2.0.3-beta.4 script: ./docker-build --verbose --config .build.yml --release github on: tags: true diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index fd00c644..3e23fe9f 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -30,6 +30,7 @@ #include "theme-thumbnail.h" #include "capplet-util.h" #include "appearance-style.h" +#include <gdk/gdkx.h> #define GSETTINGS_SETTINGS "GSETTINGS_SETTINGS" #define GSETTINGS_KEY "GSETTINGS_KEY" @@ -152,6 +153,30 @@ treeview_selection_changed_callback (GtkTreeSelection *selection, guint data) if (list_value) { g_settings_set_string (settings, key, list_value); + + /*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) + { + GSettings *interface_gnome_settings = NULL; + interface_gnome_settings = g_settings_new_full (schema, NULL, NULL); + + if ((strcmp (key, GTK_THEME_KEY) == 0) || + (strcmp (key, ICON_THEME_KEY) == 0) || + (strcmp (key, CURSOR_THEME_KEY) == 0)) + g_settings_set_string (interface_gnome_settings, key, list_value); + + } + } + } + } } } } @@ -457,6 +482,27 @@ static void cursor_size_changed_cb (int size, AppearanceData *data) { g_settings_set_int (data->mouse_settings, CURSOR_SIZE_KEY, size); + + /*If running under wayland and the GNOME interface schema is installed + *set the cursor size under the GNOME gsettings too + */ + 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) + { + GSettings *interface_gnome_settings = NULL; + interface_gnome_settings = g_settings_new_full (schema, NULL, NULL); + g_settings_set_int (interface_gnome_settings, CURSOR_SIZE_KEY, size); + } + } + } + } } static void |