[gnome-settings-daemon/f20] Export a shell-shows-desktop setting

[Matthias Clasen]

commit 7868c3c5d08d69ecd47a32c7a477a8776d3930c4
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Nov 26 16:29:24 2013 -0500

    Export a shell-shows-desktop setting

 ...ings-export-Gtk-ShellShowsDesktop-setting.patch |   49 ++++++++++++++++++++
 gnome-settings-daemon.spec                         |    9 +++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/0001-xsettings-export-Gtk-ShellShowsDesktop-setting.patch b/0001-xsettings-export-Gtk-ShellShowsDesktop-setting.patch
new file mode 100644
index 0000000..493fe74
--- /dev/null
+++ b/0001-xsettings-export-Gtk-ShellShowsDesktop-setting.patch
@@ -0,0 +1,49 @@
+From 408e7889063f08427a11a08d8c122a66dcab6ecc Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Thu, 14 Nov 2013 11:54:27 -0500
+Subject: [PATCH] xsettings: export Gtk/ShellShowsDesktop setting
+
+Export a property for whether the desktop icons are shown or not.  This
+will allow Gtk to decide if we should show the 'Desktop' item in the
+places sidebar, according to if the user has enabled their desktop icons
+or not.  We use the value of the GSettings key 'show-desktop-icons' from
+'org.gnome.desktop.background'.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712302
+---
+ plugins/xsettings/gsd-xsettings-manager.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
+index cad40d0..91bc00d 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -48,6 +48,7 @@
+ #define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate))
+ 
+ #define MOUSE_SETTINGS_SCHEMA     "org.gnome.settings-daemon.peripherals.mouse"
++#define BACKGROUND_SETTINGS_SCHEMA "org.gnome.desktop.background"
+ #define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
+ #define SOUND_SETTINGS_SCHEMA     "org.gnome.desktop.sound"
+ #define PRIVACY_SETTINGS_SCHEMA     "org.gnome.desktop.privacy"
+@@ -355,6 +356,8 @@ 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 },
+ 
++        { "org.gnome.desktop.background", "show-desktop-icons",    "Gtk/ShellShowsDesktop",   translate_bool_int },
++
+         { "org.gnome.desktop.interface", "gtk-color-palette",      "Gtk/ColorPalette",        translate_string_string },
+         { "org.gnome.desktop.interface", "font-name",              "Gtk/FontName",            translate_string_string },
+         { "org.gnome.desktop.interface", "gtk-key-theme",          "Gtk/KeyThemeName",        translate_string_string },
+@@ -965,6 +968,8 @@ gnome_xsettings_manager_start (GnomeXSettingsManager *manager,
+         g_hash_table_insert (manager->priv->settings,
+                              MOUSE_SETTINGS_SCHEMA, g_settings_new (MOUSE_SETTINGS_SCHEMA));
+         g_hash_table_insert (manager->priv->settings,
++                             BACKGROUND_SETTINGS_SCHEMA, g_settings_new (BACKGROUND_SETTINGS_SCHEMA));
++        g_hash_table_insert (manager->priv->settings,
+                              INTERFACE_SETTINGS_SCHEMA, g_settings_new (INTERFACE_SETTINGS_SCHEMA));
+         g_hash_table_insert (manager->priv->settings,
+                              SOUND_SETTINGS_SCHEMA, g_settings_new (SOUND_SETTINGS_SCHEMA));
+-- 
+1.8.4.2
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 71ddf62..a02736b 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -6,7 +6,7 @@
 
 Name:           gnome-settings-daemon
 Version:        3.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -23,6 +23,9 @@ Patch1:         0001-updates-Correctly-start-gnome-software-when-clicking.patch
 # already upstream, fixes review in gnome-software
 Patch2:         0001-updates-Remove-the-unconditional-clearing-of-the-off.patch
 
+# upstream fix
+Patch3: 	0001-xsettings-export-Gtk-ShellShowsDesktop-setting.patch
+
 BuildRequires:  gtk3-devel >= 3.7.8
 BuildRequires:  gnome-desktop3-devel >= %{gnome_desktop_version}
 BuildRequires:  xorg-x11-proto-devel libXxf86misc-devel
@@ -96,6 +99,7 @@ The %{name}-updates package contains the updates plugin for %{name}
 
 %patch1 -p1 -b .updates-fix-notification
 %patch2 -p1 -b .updates-fix-review
+%patch3 -p1 -b .shows-desktop
 
 autoreconf -i -f
 
@@ -281,6 +285,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 
 %changelog
+* Tue Nov 26 2013 Matthias Clasen <mclasen at redhat.com> - 3.10.2-3
+- Export a shell-shows-desktop xsetting
+
 * Mon Nov 25 2013 Richard Hughes <rhughes at redhat.com> - 3.10.2-2
 - Backport a patch to make 'Review' work when using gnome-software