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

Proposed by Lars Karlitski on 2014-08-01
Status: Merged
Approved by: Iain Lane on 2014-12-17
Approved revision: 12786
Merged at revision: 12799
Proposed branch: lp:~larsu/unity-control-center/dont-set-overlay-scrollbars
Merge into: lp:unity-control-center
Diff against target: 67 lines (+0/-24)
1 file modified
panels/appearance/cc-appearance-panel.c (+0/-24)
To merge this branch: bzr merge lp:~larsu/unity-control-center/dont-set-overlay-scrollbars
Reviewer Review Type Date Requested Status
Iain Lane 2014-08-01 Approve on 2014-12-17
PS Jenkins bot (community) continuous-integration Approve on 2014-08-01
Review via email: mp+229271@code.launchpad.net

Commit message

appearance: don't set overlay-scrollbar setting

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/appearance/cc-appearance-panel.c'
2--- panels/appearance/cc-appearance-panel.c 2014-07-02 09:42:52 +0000
3+++ panels/appearance/cc-appearance-panel.c 2014-08-01 19:30:33 +0000
4@@ -69,7 +69,6 @@
5
6 GSettings *settings;
7 GSettings *interface_settings;
8- GSettings *canonical_interface_settings;
9 GSettings *wm_theme_settings;
10 GSettings *unity_settings;
11 GSettings *compizcore_settings;
12@@ -205,12 +204,6 @@
13 priv->interface_settings = NULL;
14 }
15
16- if (priv->canonical_interface_settings)
17- {
18- g_object_unref (priv->canonical_interface_settings);
19- priv->canonical_interface_settings = NULL;
20- }
21-
22 if (priv->wm_theme_settings)
23 {
24 g_object_unref (priv->wm_theme_settings);
25@@ -1308,25 +1301,11 @@
26
27 g_settings_delay (self->priv->interface_settings);
28
29- if (self->priv->canonical_interface_settings != NULL)
30- g_settings_delay (self->priv->canonical_interface_settings);
31-
32 g_settings_set_string (self->priv->interface_settings, "gtk-theme", gtk_theme);
33 g_settings_set_string (self->priv->interface_settings, "icon-theme", icon_theme);
34 g_settings_set_string (self->priv->interface_settings, "cursor-theme", cursor_theme);
35 g_settings_set_string (self->priv->wm_theme_settings, "theme", window_theme);
36
37-
38- /* disable overlay scrollbars for a11y if installed*/
39- if (self->priv->canonical_interface_settings)
40- {
41- if (g_strcmp0 (gtk_theme, "HighContrast") == 0 )
42- g_settings_set_string (self->priv->canonical_interface_settings, "scrollbar-mode", "normal");
43- else
44- g_settings_reset (self->priv->canonical_interface_settings, "scrollbar-mode");
45- g_settings_apply (self->priv->canonical_interface_settings);
46- }
47-
48 g_settings_apply (self->priv->interface_settings);
49
50 g_free (gtk_theme);
51@@ -1350,8 +1329,6 @@
52 priv->interface_settings = g_settings_new ("org.gnome.desktop.interface");
53
54 source = g_settings_schema_source_get_default ();
55- if (source != NULL && g_settings_schema_source_lookup (source, CANONICAL_DESKTOP_INTERFACE, TRUE) != NULL)
56- priv->canonical_interface_settings = g_settings_new (CANONICAL_DESKTOP_INTERFACE);
57
58 priv->wm_theme_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
59 current_gtk_theme = g_settings_get_string (priv->interface_settings, "gtk-theme");
60@@ -1836,7 +1813,6 @@
61 GSettingsSchemaSource* source;
62
63 source = g_settings_schema_source_get_default ();
64-
65 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
66 if (schema)
67 {

Subscribers

People subscribed via source and target branches