[nautilus/gnome-3-8] canvas-dnd: don't use activation URI for DnD of special desktop items

[Cosimo Cecchi <cosimoc src gnome org>]

commit 50d13fa5e2a7c74c74047f8f895a154c21484650
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Apr 10 15:37:31 2013 -0400

    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

 libnautilus-private/nautilus-canvas-dnd.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/libnautilus-private/nautilus-canvas-dnd.c b/libnautilus-private/nautilus-canvas-dnd.c
index b85d635..b91b891 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;