Merge lp:~darkxst/ubuntu/saucy/gnome-settings-daemon/lp1227537 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Tim Lunn]

[Sebastien Bacher (seb128)]

Sorry but I'm reverting this one:
- those settings are still there and working in saucy
- they shouldn't have been dropped without discussion
- the fix is to workaround issues with a ppa, which can be solved by simply adding those gsettings key to the schemas in the ppa version

review: Disapprove

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-15 22:43:51 +0000
+++ debian/changelog	2013-09-19 09:28:18 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.8.5-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/git_hardcode_deprecated_gtk_settings.patch: git patch
+    to make things work with gsettings schemas 3.10 (LP: #1227537)
+
+ -- Tim Lunn <[e-mail]>  Thu, 19 Sep 2013 19:20:34 +1000
+
 gnome-settings-daemon (3.8.5-0ubuntu3) saucy; urgency=low
 
   * debian/patches/53_sync_input_sources_to_accountsservice.patch:
 
=== added file 'debian/patches/git_hardcode_deprecated_gtk_settings.patch'
--- debian/patches/git_hardcode_deprecated_gtk_settings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_hardcode_deprecated_gtk_settings.patch	2013-09-19 09:28:18 +0000
@@ -0,0 +1,94 @@
+From 815bae0575a84d93d65d72f0c71d9b247686bb8d Mon Sep 17 00:00:00 2001
+From: William Jon McCann <[e-mail]>
+Date: Fri, 12 Jul 2013 15:00:27 +0000
+Subject: xsettings: hardcode deprecated settings instead of removing them
+
+This way we don't break old apps like those that use GTK2.
+---
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
+index d4e0236..81e94c1 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -231,6 +231,14 @@ struct _TranslationEntry {
+         TranslationFunc translate;
+ };
+ 
++typedef struct _FixedEntry FixedEntry;
++typedef void (* FixedFunc) (GnomeXSettingsManager *manager,
++                            FixedEntry            *fixed);
++struct _FixedEntry {
++        const char     *xsetting_name;
++        FixedFunc       func;
++};
++
+ struct GnomeXSettingsManagerPrivate
+ {
+         guint              start_idle_id;
+@@ -308,6 +316,36 @@ translate_string_string (GnomeXSettingsManager *manager,
+         }
+ }
+ 
++static void
++fixed_false_int (GnomeXSettingsManager *manager,
++                 FixedEntry            *fixed)
++{
++        int i;
++
++        for (i = 0; manager->priv->managers [i]; i++) {
++                xsettings_manager_set_int (manager->priv->managers [i], fixed->xsetting_name, FALSE);
++        }
++}
++
++static void
++fixed_true_int (GnomeXSettingsManager *manager,
++                FixedEntry            *fixed)
++{
++        int i;
++
++        for (i = 0; manager->priv->managers [i]; i++) {
++                xsettings_manager_set_int (manager->priv->managers [i], fixed->xsetting_name, TRUE);
++        }
++}
++
++static FixedEntry fixed_entries [] = {
++        { "Gtk/MenuImages",          fixed_false_int },
++        { "Gtk/ButtonImages",        fixed_false_int },
++        { "Gtk/ShowInputMethodMenu", fixed_false_int },
++        { "Gtk/ShowUnicodeMenu",     fixed_false_int },
++        { "Gtk/AutoMnemonics",       fixed_true_int },
++};
++
+ static TranslationEntry translations [] = {
+         { "org.gnome.settings-daemon.peripherals.mouse", "double-click",   "Net/DoubleClickTime",  translate_int_int },
+         { "org.gnome.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },
+@@ -329,15 +367,10 @@ static TranslationEntry translations [] = {
+         { "org.gnome.desktop.interface", "gtk-im-status-style",    "Gtk/IMStatusStyle",       translate_string_string },
+         { "org.gnome.desktop.interface", "gtk-im-module",          "Gtk/IMModule",            translate_string_string },
+         { "org.gnome.desktop.interface", "icon-theme",             "Net/IconThemeName",       translate_string_string },
+-        { "org.gnome.desktop.interface", "menus-have-icons",       "Gtk/MenuImages",          translate_bool_int },
+-        { "org.gnome.desktop.interface", "buttons-have-icons",     "Gtk/ButtonImages",        translate_bool_int },
+         { "org.gnome.desktop.interface", "menubar-accel",          "Gtk/MenuBarAccel",        translate_string_string },
+         { "org.gnome.desktop.interface", "enable-animations",      "Gtk/EnableAnimations",    translate_bool_int },
+         { "org.gnome.desktop.interface", "cursor-theme",           "Gtk/CursorThemeName",     translate_string_string },
+         { "org.gnome.desktop.interface", "cursor-size",            "Gtk/CursorThemeSize",     translate_int_int },
+-        { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
+-        { "org.gnome.desktop.interface", "show-unicode-menu",      "Gtk/ShowUnicodeMenu",     translate_bool_int },
+-        { "org.gnome.desktop.interface", "automatic-mnemonics",    "Gtk/AutoMnemonics",       translate_bool_int },
+ 
+         { "org.gnome.desktop.sound", "theme-name",                 "Net/SoundThemeName",            translate_string_string },
+         { "org.gnome.desktop.sound", "event-sounds",               "Net/EnableEventSounds" ,        translate_bool_int },
+@@ -878,6 +911,11 @@ gnome_xsettings_manager_start (GnomeXSettingsManager *manager,
+         g_hash_table_insert (manager->priv->settings,
+                              PRIVACY_SETTINGS_SCHEMA, g_settings_new (PRIVACY_SETTINGS_SCHEMA));
+ 
++        for (i = 0; i < G_N_ELEMENTS (fixed_entries); i++) {
++                FixedEntry *fixed = &fixed_entries[i];
++                (* fixed->func) (manager, fixed);
++        }
++
+         for (i = 0; i < G_N_ELEMENTS (translations); i++) {
+                 GVariant *val;
+                 GSettings *settings;
+--
+cgit v0.9.2
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-09 01:52:56 +0000
+++ debian/patches/series	2013-09-19 09:28:18 +0000
@@ -25,3 +25,4 @@
 git_revert_hardcoded_input_methods.patch
 ubuntu-fix-desktop-file.patch
 ubuntu-lid-close-suspend.patch
+git_hardcode_deprecated_gtk_settings.patch