rpms/gnome-settings-daemon
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Hold off on settings-daemon fade if nautilus is going to do it anyway.

Browse Source
This commit is contained in:
Ray Strode 2008-10-14 20:10:00 +00:00
parent bad5eb1c76
commit d55b97edc0
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnome-settings-daemon-2.24.0-fade.patch
View File

@ -1,6 +1,6 @@
diff -up gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c
--- gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c.fade 2008-08-04 10:25:52.000000000 -0400
+++ gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c 2008-10-12 12:28:24.000000000 -0400
+++ gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.c 2008-10-14 15:50:08.000000000 -0400
@@ -155,7 +155,8 @@ nautilus_is_running (void)
}
@ -53,7 +53,7 @@ diff -up gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.
}
static void
@@ -252,6 +268,11 @@ gsd_background_manager_start (GsdBackgro
@@ -252,9 +268,12 @@ gsd_background_manager_start (GsdBackgro
G_CALLBACK (on_bg_changed),
manager);
@ -63,16 +63,34 @@ diff -up gnome-settings-daemon-2.24.0/plugins/background/gsd-background-manager.
+ manager);
+
watch_bg_preferences (manager);
gnome_bg_load_from_preferences (manager->priv->bg,
manager->priv->client);
@@ -267,9 +288,7 @@ gsd_background_manager_start (GsdBackgro
- gnome_bg_load_from_preferences (manager->priv->bg,
- manager->priv->client);
/* If this is set, nautilus will draw the background and is
* almost definitely in our session. however, it may not be
@@ -266,14 +285,22 @@ gsd_background_manager_start (GsdBackgro
nautilus_show_desktop = gconf_client_get_bool (manager->priv->client,
"/apps/nautilus/preferences/show_desktop",
NULL);
+ if (nautilus_show_desktop) {
+
+ gnome_bg_ignore_changes (manager->priv->bg, TRUE);
+
+ gnome_bg_load_from_preferences (manager->priv->bg,
+ manager->priv->client);
+
+ gnome_bg_ignore_changes (manager->priv->bg, FALSE);
- if (!nautilus_show_desktop) {
- draw_background (manager);
- } else {
+ if (nautilus_show_desktop) {
/* even when nautilus is supposedly handling the
* background, apply the settings eventually to make
* people running a nautilus-less session happy */
manager->priv->timeout_id = g_timeout_add_seconds (8, (GSourceFunc)queue_draw_background, manager);
+ } else {
+ gnome_bg_load_from_preferences (manager->priv->bg,
+ manager->priv->client);
}
gnome_settings_profile_end (NULL);

6
gnome-settings-daemon.spec
View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.24.0
Release: 11%{?dist}
Release: 12%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -165,6 +165,10 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
* Tue Oct 14 2008 Ray Strode <rstrode@redhat.com> - 2.24.0-12
- Hold off on settings-daemon fade if nautilus is going to do
it anyway.
* Tue Oct 14 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-11
- Show the shutdown dialog when the power button is pressed