From d69facaef6594c9f52a298f5f3a1ec7aa8009cdc Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Mon, 17 Dec 2001 20:47:24 +0000 Subject: [PATCH] Set the pixmap_id correctly if pixmap is NULL or -1. 2001-12-17 Bradford Hovinen * applier.c (set_root_pixmap): Set the pixmap_id correctly if pixmap is NULL or -1. --- libbackground/ChangeLog | 3 +++ libbackground/applier.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index ddfe89ec7..150e7b178 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,5 +1,8 @@ 2001-12-17 Bradford Hovinen + * applier.c (set_root_pixmap): Set the pixmap_id correctly if + pixmap is NULL or -1. + * preferences.c (preferences_merge_entry): Eliminate name; use entry->key on the warning (preferences_merge_entry): Use correct keys diff --git a/libbackground/applier.c b/libbackground/applier.c index 8c01956e5..135464907 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -1313,7 +1313,10 @@ set_root_pixmap (GdkPixmap *pixmap) guchar *data_esetroot; 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 ());