diff options
| author | A. Walton <awalton@gnome.org> | 2008-05-27 23:55:03 +0000 |
|---|---|---|
| committer | Andrew Walton <awalton@src.gnome.org> | 2008-05-27 23:55:03 +0000 |
| commit | 44a10b90e1e3d48a75122d2b4f18f8394cb1af65 (patch) | |
| tree | b9e3609ffc3002798b7b1861789b2d7a3c4159d7 | |
| parent | bd682e430ee2fd39b0918f30426cd9dc94a1cb29 (diff) | |
| download | nautilus-44a10b90e1e3d48a75122d2b4f18f8394cb1af65.tar.gz | |
Don't try to create a Cairo context for a NULL pixmap. Fixes bug #534226.
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.
svn path=/branches/gnome-2-22/; revision=14202
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-dnd.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +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. + 2008-05-27 Cosimo Cecchi <cosimoc@gnome.org> * 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 */ |