From f81c1a2a30966d315fff4f78a540f33575aef25d Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Sun, 17 Feb 2002 22:49:30 +0000 Subject: [PATCH] Only add the timeout for cleanup if we are in a root renderer; we don't 2002-02-17 Bradford Hovinen * applier.c (bg_applier_apply_prefs): Only add the timeout for cleanup if we are in a root renderer; we don't need it for preview --- libbackground/ChangeLog | 2 ++ libbackground/applier.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index 68994e4bf..d191761da 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -9,6 +9,8 @@ (need_wallpaper_load_p): We need to reload the wallpaper pixbuf if it is enabled and not loaded (cleanup_cb): Free bg_applier->p->pixbuf too + (bg_applier_apply_prefs): Only add the timeout for cleanup if we + are in a root renderer; we don't need it for preview 2002-02-12 Lauris Kaplinski diff --git a/libbackground/applier.c b/libbackground/applier.c index 4cd0e8d56..a2848f0fd 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -396,8 +396,7 @@ bg_applier_apply_prefs (BGApplier *bg_applier, new_prefs->wallpaper_filename); new_prefs->wallpaper_enabled = FALSE; } - else - { + else if (bg_applier->p->type == BG_APPLIER_ROOT) { if (bg_applier->p->timeout) g_source_remove (bg_applier->p->timeout); bg_applier->p->timeout = g_timeout_add (30000, (GSourceFunc) cleanup_cb, bg_applier);