Merge lp:~larsu/unity-control-center/dont-set-overlay-scrollbars into lp:unity-control-center

[Lars Karlitski]

appearance: don't set overlay-scrollbar setting

overlay-scrollbars now does this itself based on a key in index.theme.

appearance: don't set overlay-scrollbar setting

overlay-scrollbars now does this itself based on a key in index.theme. See

    lp:~larsu/overlay-scrollbar/only-enable-for-supported-themes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12786
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/105/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/105/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

ok

review: Approve

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2014-07-02 09:42:52 +0000
+++ panels/appearance/cc-appearance-panel.c	2014-08-01 19:30:33 +0000
@@ -69,7 +69,6 @@
 
   GSettings *settings;
   GSettings *interface_settings;
-  GSettings *canonical_interface_settings;
   GSettings *wm_theme_settings;
   GSettings *unity_settings;
   GSettings *compizcore_settings;
@@ -205,12 +204,6 @@
       priv->interface_settings = NULL;
     }
 
-  if (priv->canonical_interface_settings)
-    {
-      g_object_unref (priv->canonical_interface_settings);
-      priv->canonical_interface_settings = NULL;
-    }
-
   if (priv->wm_theme_settings)
     {
       g_object_unref (priv->wm_theme_settings);
@@ -1308,25 +1301,11 @@
 
   g_settings_delay (self->priv->interface_settings);
 
-  if (self->priv->canonical_interface_settings != NULL)
-    g_settings_delay (self->priv->canonical_interface_settings);
-
   g_settings_set_string (self->priv->interface_settings, "gtk-theme", gtk_theme);
   g_settings_set_string (self->priv->interface_settings, "icon-theme", icon_theme);
   g_settings_set_string (self->priv->interface_settings, "cursor-theme", cursor_theme);
   g_settings_set_string (self->priv->wm_theme_settings, "theme", window_theme);
 
-
-  /* disable overlay scrollbars for a11y if installed*/
-  if (self->priv->canonical_interface_settings)
-    {
-      if (g_strcmp0 (gtk_theme, "HighContrast") == 0 )
-        g_settings_set_string (self->priv->canonical_interface_settings, "scrollbar-mode", "normal");
-      else
-        g_settings_reset (self->priv->canonical_interface_settings, "scrollbar-mode");
-      g_settings_apply (self->priv->canonical_interface_settings);
-    }
-
   g_settings_apply (self->priv->interface_settings);
 
   g_free (gtk_theme);
@@ -1350,8 +1329,6 @@
   priv->interface_settings = g_settings_new ("org.gnome.desktop.interface");
 
   source = g_settings_schema_source_get_default ();
-  if (source != NULL && g_settings_schema_source_lookup (source, CANONICAL_DESKTOP_INTERFACE, TRUE) != NULL)
-    priv->canonical_interface_settings = g_settings_new (CANONICAL_DESKTOP_INTERFACE);
 
   priv->wm_theme_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
   current_gtk_theme = g_settings_get_string (priv->interface_settings, "gtk-theme");
@@ -1836,7 +1813,6 @@
   GSettingsSchemaSource* source;
 
   source = g_settings_schema_source_get_default ();
-
   schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
   if (schema)
     {