[gimp/gimp-2-8] Bug 689087 - Drag-and-drop foo.jpg behaves different from 'gimp foo.jpg'...

[Michael Natterer <mitch src gnome org>]

commit 67cb43963e55bc56c031194209ab693045fa2741
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jan 9 00:28:30 2013 +0100

    Bug 689087 - Drag-and-drop foo.jpg behaves different from 'gimp foo.jpg'...
    
    Prefer text/uri-list over image/* to make dropping from file managers
    always behave like opening the image directly.
    (cherry picked from commit 454639f9d9703a14a235973d81378afc53387862)

 app/display/gimpdisplayshell-dnd.c |   12 ++++----
 app/widgets/gimplayertreeview.c    |    4 +-
 app/widgets/gimptoolbox-dnd.c      |   48 +++++++++++++++++------------------
 3 files changed, 31 insertions(+), 33 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c
index 3a382d3..1a05759 100644
--- a/app/display/gimpdisplayshell-dnd.c
+++ b/app/display/gimpdisplayshell-dnd.c
@@ -140,18 +140,18 @@ gimp_display_shell_dnd_init (GimpDisplayShell *shell)
   gimp_dnd_color_dest_add     (shell->canvas,
                                gimp_display_shell_drop_color,
                                shell);
-  gimp_dnd_svg_dest_add       (shell->canvas,
-                               gimp_display_shell_drop_svg,
-                               shell);
   gimp_dnd_component_dest_add (shell->canvas,
                                gimp_display_shell_drop_component,
                                shell);
-  gimp_dnd_pixbuf_dest_add    (shell->canvas,
-                               gimp_display_shell_drop_pixbuf,
-                               shell);
   gimp_dnd_uri_list_dest_add  (shell->canvas,
                                gimp_display_shell_drop_uri_list,
                                shell);
+  gimp_dnd_svg_dest_add       (shell->canvas,
+                               gimp_display_shell_drop_svg,
+                               shell);
+  gimp_dnd_pixbuf_dest_add    (shell->canvas,
+                               gimp_display_shell_drop_pixbuf,
+                               shell);
 }
 
 
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index e76809a..682b094 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -366,10 +366,10 @@ gimp_layer_tree_view_constructed (GObject *object)
                                NULL, tree_view);
   gimp_dnd_viewable_dest_add  (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER_MASK,
                                NULL, tree_view);
-  gimp_dnd_pixbuf_dest_add    (GTK_WIDGET (tree_view->view),
-                               NULL, tree_view);
   gimp_dnd_uri_list_dest_add  (GTK_WIDGET (tree_view->view),
                                NULL, tree_view);
+  gimp_dnd_pixbuf_dest_add    (GTK_WIDGET (tree_view->view),
+                               NULL, tree_view);
 
   /*  hide basically useless edit button  */
   gtk_widget_hide (gimp_item_tree_view_get_edit_button (GIMP_ITEM_TREE_VIEW (layer_view)));
diff --git a/app/widgets/gimptoolbox-dnd.c b/app/widgets/gimptoolbox-dnd.c
index 06563a4..449294f 100644
--- a/app/widgets/gimptoolbox-dnd.c
+++ b/app/widgets/gimptoolbox-dnd.c
@@ -103,37 +103,35 @@ gimp_toolbox_dnd_init (GimpToolbox *toolbox,
                      0, NULL, 0,
                      GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-  gimp_dnd_viewable_dest_add (vbox,
-                              GIMP_TYPE_LAYER,
-                              gimp_toolbox_drop_drawable,
-                              context);
-  gimp_dnd_viewable_dest_add (vbox,
-                              GIMP_TYPE_LAYER_MASK,
-                              gimp_toolbox_drop_drawable,
-                              context);
-  gimp_dnd_viewable_dest_add (vbox,
-                              GIMP_TYPE_CHANNEL,
-                              gimp_toolbox_drop_drawable,
-                              context);
-  gimp_dnd_viewable_dest_add (vbox,
-                              GIMP_TYPE_TOOL_INFO,
-                              gimp_toolbox_drop_tool,
-                              context);
-  gimp_dnd_viewable_dest_add (vbox,
-                              GIMP_TYPE_BUFFER,
-                              gimp_toolbox_drop_buffer,
-                              context);
-
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_LAYER,
+                               gimp_toolbox_drop_drawable,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_LAYER_MASK,
+                               gimp_toolbox_drop_drawable,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_CHANNEL,
+                               gimp_toolbox_drop_drawable,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_TOOL_INFO,
+                               gimp_toolbox_drop_tool,
+                               context);
+  gimp_dnd_viewable_dest_add  (vbox,
+                               GIMP_TYPE_BUFFER,
+                               gimp_toolbox_drop_buffer,
+                               context);
   gimp_dnd_component_dest_add (vbox,
                                gimp_toolbox_drop_component,
                                context);
+  gimp_dnd_uri_list_dest_add  (vbox,
+                               gimp_toolbox_drop_uri_list,
+                               context);
   gimp_dnd_pixbuf_dest_add    (vbox,
                                gimp_toolbox_drop_pixbuf,
                                context);
-
-  gimp_dnd_uri_list_dest_add (vbox,
-                              gimp_toolbox_drop_uri_list,
-                              context);
 }