diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2013-04-10 15:37:31 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2013-04-15 18:43:08 -0400 |
| commit | 50d13fa5e2a7c74c74047f8f895a154c21484650 (patch) | |
| tree | 2662b4ea39f93fba579e925c1eaba3cd632488cc | |
| parent | 771d497088bdc7c6c8be3c6a38f815c8ad531fca (diff) | |
| download | nautilus-50d13fa5e2a7c74c74047f8f895a154c21484650.tar.gz | |
canvas-dnd: don't use activation URI for DnD of special desktop items
Or moving icons on the desktop itself will break.
https://bugzilla.gnome.org/show_bug.cgi?id=697682
| -rw-r--r-- | libnautilus-private/nautilus-canvas-dnd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libnautilus-private/nautilus-canvas-dnd.c b/libnautilus-private/nautilus-canvas-dnd.c index b85d635b3..b91b89140 100644 --- a/libnautilus-private/nautilus-canvas-dnd.c +++ b/libnautilus-private/nautilus-canvas-dnd.c @@ -238,7 +238,12 @@ icon_get_data_binder (NautilusCanvasIcon *icon, gpointer data) canvas_rect_world_to_widget (EEL_CANVAS (container), &world_rect, &widget_rect); - uri = nautilus_canvas_container_get_icon_activation_uri (container, icon); + uri = nautilus_canvas_container_get_icon_uri (container, icon); + if (!eel_uri_is_desktop (uri)) { + g_free (uri); + uri = nautilus_canvas_container_get_icon_activation_uri (container, icon); + } + if (uri == NULL) { g_warning ("no URI for one of the iterated icons"); return TRUE; |