From 44a10b90e1e3d48a75122d2b4f18f8394cb1af65 Mon Sep 17 00:00:00 2001 From: "A. Walton" Date: Tue, 27 May 2008 23:55:03 +0000 Subject: Don't try to create a Cairo context for a NULL pixmap. Fixes bug #534226. 2008-05-27 A. Walton * libnautilus-private/nautilus-icon-dnd.c: (drag_begin_callback): Don't try to create a Cairo context for a NULL pixmap. Fixes bug #534226. svn path=/branches/gnome-2-22/; revision=14202 --- ChangeLog | 6 ++++++ libnautilus-private/nautilus-icon-dnd.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a1231ba1a..d129f7ee8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-27 A. Walton + + * libnautilus-private/nautilus-icon-dnd.c: (drag_begin_callback): + Don't try to create a Cairo context for a NULL pixmap. + Fixes bug #534226. + 2008-05-27 Cosimo Cecchi * libnautilus-private/nautilus-dnd.c: diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index c5216e4f4..614268bb3 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -1467,7 +1467,7 @@ drag_begin_callback (GtkWidget *widget, 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 */ -- cgit v1.2.1