[gimp/soc-2010-cage-2] Bug 550662 - DND prefers text/plain over text/svg+xml, should be other way around

[Michael Muré <mmure src gnome org>]

commit 53a07ac7f3e98a2a0843105b49db7998cf5f5bef
Author: Michael Natterer <mitch gimp org>
Date:   Mon Nov 29 22:04:56 2010 +0100

    Bug 550662 - DND prefers text/plain over text/svg+xml, should be other way around
    
    Move the call to gimp_dnd_uri_list_dest_add() to the end of the DND
    setup code because it adds text/plain for legacy URI DND support,
    which is way too generic to be handled first.

 app/display/gimpdisplayshell-dnd.c |    6 +++---
 app/widgets/gimplayertreeview.c    |    4 ++--
 app/widgets/gimptoolbox-dnd.c      |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c
index d007640..63b1f47 100644
--- a/app/display/gimpdisplayshell-dnd.c
+++ b/app/display/gimpdisplayshell-dnd.c
@@ -119,9 +119,6 @@ gimp_display_shell_dnd_init (GimpDisplayShell *shell)
 {
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
 
-  gimp_dnd_uri_list_dest_add  (shell->canvas,
-                               gimp_display_shell_drop_uri_list,
-                               shell);
   gimp_dnd_viewable_dest_add  (shell->canvas, GIMP_TYPE_LAYER,
                                gimp_display_shell_drop_drawable,
                                shell);
@@ -152,6 +149,9 @@ gimp_display_shell_dnd_init (GimpDisplayShell *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);
 }
 
 
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index 50caebe..0421680 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -367,8 +367,6 @@ gimp_layer_tree_view_constructor (GType                  type,
                     G_CALLBACK (gimp_layer_tree_view_mask_clicked),
                     layer_view);
 
-  gimp_dnd_uri_list_dest_add  (GTK_WIDGET (tree_view->view),
-                               NULL, tree_view);
   gimp_dnd_component_dest_add (GTK_WIDGET (tree_view->view),
                                NULL, tree_view);
   gimp_dnd_viewable_dest_add  (GTK_WIDGET (tree_view->view), GIMP_TYPE_CHANNEL,
@@ -377,6 +375,8 @@ gimp_layer_tree_view_constructor (GType                  type,
                                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);
 
   /*  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 dcc3d92..0c39df3 100644
--- a/app/widgets/gimptoolbox-dnd.c
+++ b/app/widgets/gimptoolbox-dnd.c
@@ -113,10 +113,6 @@ gimp_toolbox_dnd_init (GimpToolbox *toolbox,
                      0, NULL, 0,
                      GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-  gimp_dnd_uri_list_dest_add (vbox,
-                              gimp_toolbox_drop_uri_list,
-                              context);
-
   gimp_dnd_viewable_dest_add (vbox,
                               GIMP_TYPE_LAYER,
                               gimp_toolbox_drop_drawable,
@@ -144,6 +140,10 @@ gimp_toolbox_dnd_init (GimpToolbox *toolbox,
   gimp_dnd_pixbuf_dest_add    (vbox,
                                gimp_toolbox_drop_pixbuf,
                                context);
+
+  gimp_dnd_uri_list_dest_add (vbox,
+                              gimp_toolbox_drop_uri_list,
+                              context);
 }