diff options
| author | Dave Camp <dave@ximian.com> | 2002-03-26 18:53:49 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2002-03-26 18:53:49 +0000 |
| commit | 8f172b308da49530f3b365c5e6c4ee58ce9e5c69 (patch) | |
| tree | 9ffb92a48bde32f2e156a5ec1903f0f2f3628a82 /libbackground/applier.c | |
| parent | b8e874212ceab2c6f25a77a6bf15910c1d506d14 (diff) | |
| download | gnome-control-center-8f172b308da49530f3b365c5e6c4ee58ce9e5c69.tar.gz | |
Don't initialize is_nautilus_running here (check it each time inMETATHEME_0_9_5
2002-03-26 Dave Camp <dave@ximian.com>
* 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.
Diffstat (limited to 'libbackground/applier.c')
| -rw-r--r-- | libbackground/applier.c | 9 |
1 files changed, 3 insertions, 6 deletions
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) |