pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 211773 from GNOME:Factory

Browse Source 
Add patch to remove anoying desktop folder link in nautilus sidebar when gtk3+ is version 3.10.5 or higher (forwarded request 210899 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/211773
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=101
This commit is contained in:
Tomáš Chvátal 2013-12-22 18:33:11 +00:00 committed by Git OBS Bridge
commit a365615ee6
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch Normal file
View File

@ -0,0 +1,45 @@
From 408e7889063f08427a11a08d8c122a66dcab6ecc Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
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

8
gnome-settings-daemon.changes
View File

@ -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

3
gnome-settings-daemon.spec
View File

@ -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