diff options
| author | Bradford Hovinen <hovinen@ximian.com> | 2001-12-06 21:14:38 +0000 |
|---|---|---|
| committer | Bradford Hovinen (Gdict maintainer) <hovinen@src.gnome.org> | 2001-12-06 21:14:38 +0000 |
| commit | 3c5c2eef0e78bab49e17c05fada4471c51a25fa5 (patch) | |
| tree | d26d43b9c809dbd7877b90b8d67aa3006402bcc7 | |
| parent | e1d27120484d3e32032299071895bc9cb12bdd97 (diff) | |
| download | gnome-control-center-3c5c2eef0e78bab49e17c05fada4471c51a25fa5.tar.gz | |
Don't try to grab the X window if we are just setting the window property
2001-12-06 Bradford Hovinen <hovinen@ximian.com>
* applier.c (set_root_pixmap): Don't try to grab the X window if
we are just setting the window property back to the same value
| -rw-r--r-- | capplets/background/ChangeLog | 5 | ||||
| -rw-r--r-- | capplets/background/applier.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 682b18fa4..9e60fb5bf 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,8 @@ +2001-12-06 Bradford Hovinen <hovinen@ximian.com> + + * applier.c (set_root_pixmap): Don't try to grab the X window if + we are just setting the window property back to the same value + 2001-11-16 Bradford Hovinen <hovinen@ximian.com> * Makefile.am (EXTRA_DIST): Remove $(oaf_DATA).in diff --git a/capplets/background/applier.c b/capplets/background/applier.c index 945ceeb09..539142c9b 100644 --- a/capplets/background/applier.c +++ b/capplets/background/applier.c @@ -1329,7 +1329,8 @@ set_root_pixmap (GdkPixmap *pixmap) guchar *data_esetroot; Pixmap pixmap_id; - pixmap_id = GDK_WINDOW_XWINDOW (pixmap); + if (pixmap != (GdkPixmap *) -1) + pixmap_id = GDK_WINDOW_XWINDOW (pixmap); XGrabServer (GDK_DISPLAY ()); |