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

don't call set_root_pixmap() at all if nautilus is running. It didn't do

Browse source 
2002-05-31  Damon Chaplin  <damon@ximian.com>

	* applier.c (bg_applier_apply_prefs): don't call set_root_pixmap() at
	all if nautilus is running. It didn't do anything in this case anyway.
	Removed the nice(20). A library function shouldn't do this. If
	gnome-settings-daemon wants to be niced then it should do it in main()
	or something like that.
	(set_root_pixmap): do a final check to see if nautilus is running
	before setting the pixmap.

	Fixes part of #74311.
This commit is contained in:
Damon Chaplin 2002-05-31 19:58:02 +00:00 • committed by Damon Chaplin
parent 0d2b0a7299
commit d185c631b2
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libbackground/ChangeLog
View file

@ -1,3 +1,15 @@
2002-05-31 Damon Chaplin <damon@ximian.com>
* applier.c (bg_applier_apply_prefs): don't call set_root_pixmap() at
all if nautilus is running. It didn't do anything in this case anyway.
Removed the nice(20). A library function shouldn't do this. If
gnome-settings-daemon wants to be niced then it should do it in main()
or something like that.
(set_root_pixmap): do a final check to see if nautilus is running
before setting the pixmap.
Fixes part of #74311.
2002-05-21 jacob berkman <jacob@ximian.com>
* applier.c (render_to_screen): use a gc for the pixmap not the

9
libbackground/applier.c
View file

@ -428,7 +428,6 @@ bg_applier_apply_prefs (BGApplier *bg_applier,
}
if (bg_applier->p->type == BG_APPLIER_ROOT && is_nautilus_running ()) {
set_root_pixmap ((GdkPixmap *) -1);
return;
}
@ -461,9 +460,6 @@ bg_applier_apply_prefs (BGApplier *bg_applier,
}
}
if (bg_applier->p->type == BG_APPLIER_ROOT)
nice (20);
run_render_pipeline (bg_applier, new_prefs);
if (bg_applier->p->last_prefs != NULL)
@ -1383,6 +1379,11 @@ set_root_pixmap (GdkPixmap *pixmap)
guchar *data_esetroot;
Pixmap pixmap_id;
/* Final check to see if nautilus is running. If it is, we don't
touch the root pixmap at all. */
if (is_nautilus_running ())
return;
if (pixmap != NULL && pixmap != (GdkPixmap *) -1)
pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
else