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

Fixed nitems check (set_root_pixmap): Passing -1 makes the function just

Browse source 
2001-06-20  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/new-background-properties/applier.c
	(is_nautilus_running): Fixed nitems check
	(set_root_pixmap): Passing -1 makes the function just set the
	pixmap to what it was
This commit is contained in:
Bradford Hovinen 2001-06-20 15:50:59 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 0b43d32e46
commit a5f7ac1dab
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-06-20 Bradford Hovinen <hovinen@ximian.com>
* capplets/new-background-properties/applier.c
(is_nautilus_running): Fixed nitems check
(set_root_pixmap): Passing -1 makes the function just set the
pixmap to what it was
2001-06-18 Bradford Hovinen <hovinen@ximian.com> 2001-06-18 Bradford Hovinen <hovinen@ximian.com>
* capplets/new-*/main.c (do_set_xml): Use read () rather than * capplets/new-*/main.c (do_set_xml): Use read () rather than

14
capplets/background/applier.c
View file

@ -309,7 +309,7 @@ applier_apply_prefs (Applier *applier, Preferences *prefs,
g_return_if_fail (IS_PREFERENCES (prefs)); g_return_if_fail (IS_PREFERENCES (prefs));
if (do_root && applier->private->nautilus_running) { if (do_root && applier->private->nautilus_running) {
set_root_pixmap (None); set_root_pixmap (-1);
do_root = FALSE; do_root = FALSE;
} }
@ -1244,7 +1244,7 @@ make_root_pixmap (gint width, gint height)
* do this atomically with XGrabServer to make sure that * do this atomically with XGrabServer to make sure that
* we won't leak the pixmap if somebody else it setting * we won't leak the pixmap if somebody else it setting
* it at the same time. (This assumes that they follow the * it at the same time. (This assumes that they follow the
* same conventions we do * same conventions we do)
*/ */
static void static void
@ -1269,14 +1269,16 @@ set_root_pixmap (Pixmap pixmap)
old_pixmap = *((Pixmap *) data_esetroot); old_pixmap = *((Pixmap *) data_esetroot);
if (old_pixmap != pixmap) if (pixmap != -1 && old_pixmap != pixmap)
XKillClient(GDK_DISPLAY (), old_pixmap); XKillClient(GDK_DISPLAY (), old_pixmap);
else if (pixmap == -1)
pixmap = old_pixmap;
} }
XFree (data_esetroot); XFree (data_esetroot);
} }
if (pixmap != None) { if (pixmap != None && pixmap != -1) {
XChangeProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (), XChangeProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
gdk_atom_intern ("ESETROOT_PMAP_ID", FALSE), gdk_atom_intern ("ESETROOT_PMAP_ID", FALSE),
XA_PIXMAP, 32, PropModeReplace, XA_PIXMAP, 32, PropModeReplace,
@ -1288,7 +1290,7 @@ set_root_pixmap (Pixmap pixmap)
XSetWindowBackgroundPixmap (GDK_DISPLAY (), GDK_ROOT_WINDOW (), XSetWindowBackgroundPixmap (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
pixmap); pixmap);
} else { } else if (pixmap == None) {
XDeleteProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (), XDeleteProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
gdk_atom_intern ("ESETROOT_PMAP_ID", FALSE)); gdk_atom_intern ("ESETROOT_PMAP_ID", FALSE));
XDeleteProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (), XDeleteProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
@ -1348,7 +1350,7 @@ is_nautilus_running (void)
if (error == BadWindow) return FALSE; if (error == BadWindow) return FALSE;
if (actual_type == XA_STRING && if (actual_type == XA_STRING &&
nitems == 2 && nitems == 24 &&
bytes_after == 0 && bytes_after == 0 &&
actual_format == 8 && actual_format == 8 &&
data != NULL && data != NULL &&