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)
This commit is contained in:
Matthias Clasen 2006-04-28 14:32:09 +00:00 committed by Matthias Clasen
parent 7e15674cd9
commit 373cbb13be
3 changed files with 17 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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,