Set the pixmap_id correctly if pixmap is NULL or -1.
2001-12-17 Bradford Hovinen <hovinen@ximian.com> * applier.c (set_root_pixmap): Set the pixmap_id correctly if pixmap is NULL or -1.
This commit is contained in:
parent
d43d10b25e
commit
d69facaef6
2 changed files with 7 additions and 1 deletions
|
@ -1,5 +1,8 @@
|
||||||
2001-12-17 Bradford Hovinen <hovinen@ximian.com>
|
2001-12-17 Bradford Hovinen <hovinen@ximian.com>
|
||||||
|
|
||||||
|
* applier.c (set_root_pixmap): Set the pixmap_id correctly if
|
||||||
|
pixmap is NULL or -1.
|
||||||
|
|
||||||
* preferences.c (preferences_merge_entry): Eliminate name; use
|
* preferences.c (preferences_merge_entry): Eliminate name; use
|
||||||
entry->key on the warning
|
entry->key on the warning
|
||||||
(preferences_merge_entry): Use correct keys
|
(preferences_merge_entry): Use correct keys
|
||||||
|
|
|
@ -1313,7 +1313,10 @@ set_root_pixmap (GdkPixmap *pixmap)
|
||||||
guchar *data_esetroot;
|
guchar *data_esetroot;
|
||||||
Pixmap pixmap_id;
|
Pixmap pixmap_id;
|
||||||
|
|
||||||
pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
|
if (pixmap != NULL && pixmap != (GdkPixmap *) -1)
|
||||||
|
pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
|
||||||
|
else
|
||||||
|
pixmap_id = 0;
|
||||||
|
|
||||||
XGrabServer (GDK_DISPLAY ());
|
XGrabServer (GDK_DISPLAY ());
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue