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

Check if nitems is 1, not 4 (set_root_pixmap): Do a sanity check on the

Browse source 
2000-12-21  Bradford Hovinen  <hovinen@helixcode.com>

	* capplets/new-background-properties/applier.c (set_root_pixmap):
	Check if nitems is 1, not 4
	(set_root_pixmap): Do a sanity check on the old pixmap before
	freeing it
This commit is contained in:
Bradford Hovinen 2000-12-21 20:43:13 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent f659d17851
commit 5493103f0b
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
capplets/background/applier.c
View file

@ -1208,7 +1208,7 @@ set_root_pixmap (Pixmap pixmap)
gint format;
guchar *data_esetroot;
XGrabServer (GDK_DISPLAY ());
/* XGrabServer (GDK_DISPLAY ()); */
XGetWindowProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
gdk_atom_intern ("ESETROOT_PMAP_ID", FALSE),
@ -1217,9 +1217,14 @@ set_root_pixmap (Pixmap pixmap)
&data_esetroot);
if (type == XA_PIXMAP) {
if (format == 32 && nitems == 4)
XKillClient(GDK_DISPLAY (),
*((Pixmap *) data_esetroot));
if (format == 32 && nitems == 1) {
Pixmap old_pixmap;
old_pixmap = *((Pixmap *) data_esetroot);
if (old_pixmap != pixmap)
XKillClient(GDK_DISPLAY (), old_pixmap);
}
XFree (data_esetroot);
}
@ -1244,7 +1249,7 @@ set_root_pixmap (Pixmap pixmap)
}
XClearWindow (GDK_DISPLAY (), GDK_ROOT_WINDOW ());
XUngrabServer (GDK_DISPLAY ());
/* XUngrabServer (GDK_DISPLAY ()); */
XFlush(GDK_DISPLAY ());
}