nautilus r14202 - in branches/gnome-2-22: . libnautilus-private

[awalton svn gnome org]

Author: awalton
Date: Tue May 27 23:55:03 2008
New Revision: 14202
URL: http://svn.gnome.org/viewvc/nautilus?rev=14202&view=rev

Log:
2008-05-27  A. Walton  <awalton gnome org>

	* libnautilus-private/nautilus-icon-dnd.c: 
(drag_begin_callback):
	Don't try to create a Cairo context for a NULL pixmap.
	Fixes bug #534226.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/libnautilus-private/nautilus-icon-dnd.c

Modified: branches/gnome-2-22/libnautilus-private/nautilus-icon-dnd.c
==============================================================================
--- branches/gnome-2-22/libnautilus-private/nautilus-icon-dnd.c	(original)
+++ branches/gnome-2-22/libnautilus-private/nautilus-icon-dnd.c	Tue May 27 23:55:03 2008
@@ -1467,7 +1467,7 @@
         x_offset = start_x - winx;
         y_offset = start_y - winy;
 
-	if (!use_mask) {
+	if (!use_mask && pixmap != NULL) {
 		cairo_t *cr;
 
 		/* If composite works, make the icons partially transparent */