applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't initialize is_nautilus_running here (check it each time in

Browse source 
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.
This commit is contained in:
Dave Camp 2002-03-26 18:53:49 +00:00 • committed by Dave Camp
parent b8e874212c
commit 8f172b308d
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libbackground/ChangeLog
View file

@ -1,3 +1,10 @@
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.
2002-03-19 Richard Hestilow <hestilow@ximian.com> 2002-03-19 Richard Hestilow <hestilow@ximian.com>
* preferences.h (wallpaper_type_t): Remove EMBOSSED since we * preferences.h (wallpaper_type_t): Remove EMBOSSED since we

9
libbackground/applier.c
View file

@ -60,10 +60,6 @@ struct _BGApplierPrivate
GdkPixbuf *wallpaper_pixbuf; /* The "raw" wallpaper pixbuf */ 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 BGApplierType type; /* Whether we render to the
* root or the preview */ * 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->last_prefs = NULL;
bg_applier->p->pixbuf = NULL; bg_applier->p->pixbuf = NULL;
bg_applier->p->wallpaper_pixbuf = NULL; bg_applier->p->wallpaper_pixbuf = NULL;
bg_applier->p->nautilus_running = is_nautilus_running ();
bg_applier->p->timeout = 0; bg_applier->p->timeout = 0;
} }
@ -376,8 +371,10 @@ bg_applier_apply_prefs (BGApplier *bg_applier,
new_prefs->wallpaper_type = WPTYPE_CENTERED; 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); set_root_pixmap ((GdkPixmap *) -1);
return;
}
if (!new_prefs->enabled) { if (!new_prefs->enabled) {
if (bg_applier->p->type == BG_APPLIER_PREVIEW) if (bg_applier->p->type == BG_APPLIER_PREVIEW)