summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2008-05-05 18:10:08 +0000
committerJens Granseuer <jensg@src.gnome.org>2008-05-05 18:10:08 +0000
commit71799e3c62a4f7261f7b097b2b4b6f98905e10c8 (patch)
tree62f0cf97c850bb29d290e282af3692e92b48a172
parentd4ce9aaca104020dbfe1ae331c79bffb5d5aaf95 (diff)
downloadgnome-settings-daemon-71799e3c62a4f7261f7b097b2b4b6f98905e10c8.tar.gz
add a comment explaining why we are applying the prefs regardless of
2008-05-02 Jens Granseuer <jensgr@gmx.net> * plugins/background/gsd-background-manager.c: (gsd_background_manager_start): add a comment explaining why we are applying the prefs regardless of nautilus svn path=/trunk/; revision=331
-rw-r--r--ChangeLog6
-rw-r--r--plugins/background/gsd-background-manager.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27f94e80..212710d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-05-02 Jens Granseuer <jensgr@gmx.net>
+ * plugins/background/gsd-background-manager.c:
+ (gsd_background_manager_start): add a comment explaining why we
+ are applying the prefs regardless of nautilus
+
+2008-05-02 Jens Granseuer <jensgr@gmx.net>
+
Patch by: Matthias Clasen <mclasen@redhat.com>
* plugins/background/gsd-background-manager.c:
diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
index 68c124f3..c61ef774 100644
--- a/plugins/background/gsd-background-manager.c
+++ b/plugins/background/gsd-background-manager.c
@@ -318,6 +318,9 @@ gsd_background_manager_start (GsdBackgroundManager *manager,
if (!nautilus_show_desktop) {
apply_prefs (manager);
} else {
+ /* even when nautilus is supposedly handling the
+ * background, apply the settings eventually to make
+ * people running a nautilus-less session happy */
g_timeout_add_seconds (8, apply_prefs, manager);
}