From 1b16847290073d060f4e1d36fac33bde27d5f156458940af70d37dec118bd951 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 19 Dec 2013 20:53:21 +0000 Subject: [PATCH] Accepting request 210899 from home:Zaitor:branches:GNOME:Factory Add patch to remove anoying desktop folder link in nautilus sidebar when gtk3+ is version 3.10.5 or higher OBS-URL: https://build.opensuse.org/request/show/210899 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=186 --- ...export-Gtk_ShellShowsDesktop-setting.patch | 45 +++++++++++++++++++ gnome-settings-daemon.changes | 8 ++++ gnome-settings-daemon.spec | 3 ++ 3 files changed, 56 insertions(+) create mode 100644 gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch diff --git a/gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch b/gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch new file mode 100644 index 0000000..f087f37 --- /dev/null +++ b/gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch @@ -0,0 +1,45 @@ +From 408e7889063f08427a11a08d8c122a66dcab6ecc Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Thu, 14 Nov 2013 16:54:27 +0000 +Subject: 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 +--- +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)); +-- +cgit v0.9.2 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 74b5102..36b3e66 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 14 21:42:59 UTC 2013 - zaitor@opensuse.org + +- Add + gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch, + stop showing desktop folder in nautilus sidepane when using + gnome-shell (bgo#712302). + ------------------------------------------------------------------- Tue Nov 12 19:38:35 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 054a9e3..16d181e 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -49,6 +49,8 @@ Patch10: gnome-settings-daemon-bnc462640-mute-action.patch Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep Patch19: gnome-settings-daemon-notify-idle-resumed.patch +# PATCH-FIX-UPSTREAM gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch bgo#712302 zaitor@opensuse.org -- Stop showing desktopfolder in nautilus sidebar when using gnome-shell. +Patch20: gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -142,6 +144,7 @@ translation-update-upstream %patch10 -p0 %patch17 -p1 %patch19 -p1 +%patch20 -p1 %build autoreconf -f -i