gnome-desktop r5453 - trunk/libgnome-desktop

[alexl svn gnome org]

Author: alexl
Date: Thu Mar 26 13:04:33 2009
New Revision: 5453
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5453&view=rev

Log:
2009-03-26  Alexander Larsson  <alexl redhat com>

	* gnome-bg.c (gnome_bg_get_pixmap_from_root):
	push/pop error handler around getting the existing root pixmap in case
	the root properties point to something wrong.



Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-bg.c

Modified: trunk/libgnome-desktop/gnome-bg.c
==============================================================================
--- trunk/libgnome-desktop/gnome-bg.c	(original)
+++ trunk/libgnome-desktop/gnome-bg.c	Thu Mar 26 13:04:33 2009
@@ -1127,9 +1127,14 @@
 	}
 
 	if (data != NULL) {
+		gdk_error_trap_push ();
 		source_pixmap = gdk_pixmap_foreign_new (*(Pixmap *) data);
-		gdk_drawable_set_colormap (source_pixmap,
-					   gdk_screen_get_default_colormap (screen));
+		gdk_error_trap_pop ();
+
+		if (source_pixmap != NULL) {
+			gdk_drawable_set_colormap (source_pixmap,
+						   gdk_screen_get_default_colormap (screen));
+		}
 	}
 
 	width = gdk_screen_get_width (screen);