Don't force the standard DND icon if the user has a custom DND source.

2006-04-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_drag_begin): Don't force
	the standard DND icon if the user has a custom DND source.
	(#339522, Joe Wreschnig)

diff --git a/ChangeLog b/ChangeLog
index 1fd37f76e24c66fabb8b7f33f56e1efa815c0c1c..317c2780cb155775f3e84dcfb7cb5a01e0894cce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_drag_begin): Don't force
+       the standard DND icon if the user has a custom DND source.  
+       (#339522, Joe Wreschnig)
+
 2006-04-28  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktextbuffer.c (create_clipboard_contents_buffer): keep a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1fd37f76e24c66fabb8b7f33f56e1efa815c0c1c..317c2780cb155775f3e84dcfb7cb5a01e0894cce 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_drag_begin): Don't force
+       the standard DND icon if the user has a custom DND source.  
+       (#339522, Joe Wreschnig)
+
 2006-04-28  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktextbuffer.c (create_clipboard_contents_buffer): keep a

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 49ff9937f2f7580f253b5d0b4511b96449f39e4a..1fff6384fff7de423ea0d15453bf57c5a3dfed5b 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6271,11 +6271,14 @@ gtk_tree_view_drag_begin (GtkWidget      *widget,
   GtkTreePath *path = NULL;
   gint cell_x, cell_y;
   GdkPixmap *row_pix;
+  TreeViewDragInfo *di;
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  /* if the user uses a custom DnD impl, we don't set the icon here */
-  if (!get_info (tree_view))
+  /* if the user uses a custom DND source impl, we don't set the icon here */
+  di = get_info (tree_view);
+
+  if (di == NULL || !di->source_set)
     return;
 
   gtk_tree_view_get_path_at_pos (tree_view,