fix background handling without nautilus

This commit is contained in:
Matthias Clasen 2008-05-05 05:21:21 +00:00
parent 5a7ad8d906
commit fc6d323030
2 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,21 @@
diff -up gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c.no-nautilus gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c
--- gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c.no-nautilus 2008-03-24 17:42:47.000000000 -0400
+++ gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c 2008-05-05 01:08:37.000000000 -0400
@@ -292,6 +294,7 @@ gsd_background_manager_start (GsdBackgro
bg_preferences_load (manager->priv->prefs);
client = gconf_client_get_default ();
+ gconf_client_add_dir (client, "/desktop/gnome/background", GCONF_CLIENT_PRELOAD_NONE, NULL);
gconf_client_notify_add (client,
"/desktop/gnome/background",
(GConfClientNotifyFunc) background_callback,
@@ -314,6 +317,9 @@ gsd_background_manager_start (GsdBackgro
if (!nautilus_show_desktop) {
apply_prefs (manager);
}
+ else {
+ g_timeout_add_seconds (5, apply_prefs, manager);
+ }
gnome_settings_profile_end (NULL);

View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.23.1.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -39,6 +39,8 @@ Patch5: xrandr-missingok.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=530356
# https://bugzilla.redhat.com/show_bug.cgi?id=346201
Patch6: gsd-handle-different-keysyms.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=531487
Patch7: gnome-settings-daemon-background-without-nautilus.patch
%description
A daemon to share settings from GNOME to other applications. It also
@ -66,6 +68,7 @@ popd
%patch4 -p1 -b .hide-white-screen
%patch5 -p1 -b .xrandr-missingok
%patch6 -p1 -b .multi-keysyms
%patch7 -p1 -b .background-without-nautilus
%build
%configure --enable-static=no --enable-profiling
@ -148,7 +151,10 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
* Tue Apr 29 2008 - Bastien Nocera <bnocera@redhat.com> - 2.22.1.1-2
* Mon May 5 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.1-1-3
- Fix background drawing without nautilus
* Tue Apr 29 2008 - Bastien Nocera <bnocera@redhat.com> - 2.23.1.1-2
- Add patch from upstream to avoid the Stop button triggering an Eject (#346201)
* Fri Apr 25 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.1.1-1