From 8f172b308da49530f3b365c5e6c4ee58ce9e5c69 Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Tue, 26 Mar 2002 18:53:49 +0000 Subject: [PATCH] Don't initialize is_nautilus_running here (check it each time in 2002-03-26 Dave Camp * applier.c: (bg_applier_init): Don't initialize is_nautilus_running here (check it each time in appy_prefs). (bg_applier_apply_prefs): Don't try to apply the background if nautilus is running. --- libbackground/ChangeLog | 7 +++++++ libbackground/applier.c | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index d1516cfde..160923127 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,10 @@ +2002-03-26 Dave Camp + + * applier.c: (bg_applier_init): Don't initialize + is_nautilus_running here (check it each time in appy_prefs). + (bg_applier_apply_prefs): Don't try to apply the background if + nautilus is running. + 2002-03-19 Richard Hestilow * preferences.h (wallpaper_type_t): Remove EMBOSSED since we diff --git a/libbackground/applier.c b/libbackground/applier.c index 59e65d2c4..ddb8ee94b 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -60,10 +60,6 @@ struct _BGApplierPrivate GdkPixbuf *wallpaper_pixbuf; /* The "raw" wallpaper pixbuf */ - gboolean nautilus_running; /* TRUE iff nautilus is - * running, in which case we - * block the renderer */ - BGApplierType type; /* Whether we render to the * root or the preview */ @@ -213,7 +209,6 @@ bg_applier_init (BGApplier *bg_applier, BGApplierClass *class) bg_applier->p->last_prefs = NULL; bg_applier->p->pixbuf = NULL; bg_applier->p->wallpaper_pixbuf = NULL; - bg_applier->p->nautilus_running = is_nautilus_running (); bg_applier->p->timeout = 0; } @@ -376,8 +371,10 @@ bg_applier_apply_prefs (BGApplier *bg_applier, new_prefs->wallpaper_type = WPTYPE_CENTERED; } - if (bg_applier->p->type == BG_APPLIER_ROOT && bg_applier->p->nautilus_running) + if (bg_applier->p->type == BG_APPLIER_ROOT && is_nautilus_running ()) { set_root_pixmap ((GdkPixmap *) -1); + return; + } if (!new_prefs->enabled) { if (bg_applier->p->type == BG_APPLIER_PREVIEW)