← Back to branch summary

~ubuntu-desktop/gnome-settings-daemon/3.5

« back to all changes in this revision

Viewing changes to debian/patches/revert_git_a11y_gsettings.patch

  • Committer: Sebastien Bacher
  • Date: 2012-06-19 08:52:53 UTC
  • Revision ID: seb128@ubuntu.com-20120619085253-zv1co6nal0dthkn8
* debian/control.in:
  - don't build-depends on gconf
* debian/gnome-settings-daemon.gsettings-override:
  - don't enable the deprecated gconf bridge
* debian/patches/revert_git_a11y_gsettings.patch,
  debian/patches/revert_git_dropping_gconf_wrapper.patch,
  debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_git_use_gsetting_keybindings.patch:
  - drop the gconf to gsettings migration reverts
* debian/rules:
  - don't use deprecated --enable-gconf-bridge

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert_git_a11y_gsettings.patch
1
 
Index: gnome-settings-daemon-3.4.2/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c
2
 
===================================================================
3
 
--- gnome-settings-daemon-3.4.2.orig/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c        2012-04-12 11:54:01.000000000 +0200
4
 
+++ gnome-settings-daemon-3.4.2/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c     2012-05-22 21:09:13.329387322 +0200
5
 
@@ -31,6 +31,8 @@
6
 
 #include <gio/gio.h>
7
 
 #include <gtk/gtk.h>
8
 
 
9
 
+#include <gconf/gconf-client.h>
10
 
+
11
 
 #include "gsd-a11y-preferences-dialog.h"
12
 
 
13
 
 #define SM_DBUS_NAME      "org.gnome.SessionManager"
14
 
@@ -60,8 +62,8 @@
15
 
 #define DPI_FACTOR_LARGEST 2.0
16
 
 
17
 
 #define KEY_GTK_THEME          "gtk-theme"
18
 
+#define KEY_METACITY_THEME     "/apps/metacity/general/theme"
19
 
 #define KEY_ICON_THEME         "icon-theme"
20
 
-#define KEY_METACITY_THEME     "theme"
21
 
 
22
 
 #define HIGH_CONTRAST_THEME    "HighContrast"
23
 
 
24
 
@@ -167,11 +169,11 @@
25
 
 static void
26
 
 config_set_high_contrast (gboolean enabled)
27
 
 {
28
 
+        GConfClient *client;
29
 
         GSettings *settings;
30
 
-        GSettings *wm_settings;
31
 
 
32
 
+        client = gconf_client_get_default ();
33
 
         settings = g_settings_new ("org.gnome.desktop.interface");
34
 
-        wm_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
35
 
 
36
 
         if (enabled) {
37
 
                 g_settings_set_string (settings, KEY_GTK_THEME, HIGH_CONTRAST_THEME);
38
 
@@ -180,11 +182,11 @@
39
 
         } else {
40
 
                 g_settings_reset (settings, KEY_GTK_THEME);
41
 
                 g_settings_reset (settings, KEY_ICON_THEME);
42
 
-                g_settings_reset (wm_settings, KEY_METACITY_THEME);
43
 
+                gconf_client_unset (client, KEY_METACITY_THEME, NULL);
44
 
         }
45
 
 
46
 
+        g_object_unref (client);
47
 
         g_object_unref (settings);
48
 
-        g_object_unref (wm_settings);
49
 
 }
50
 
 
51
 
 static gboolean