diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-04-28 14:32:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-28 14:32:09 +0000 |
| commit | 373cbb13be67a5bc9488387e46f3bd45afc7b9e8 (patch) | |
| tree | 5e7eaaff8039a61bfbc18ce4a3ca91bd6c6e24b7 | |
| parent | 7e15674cd9909e1b3e73e0c53f9978e5eaaef0ca (diff) | |
| download | gdk-pixbuf-373cbb13be67a5bc9488387e46f3bd45afc7b9e8.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 7 |
3 files changed, 17 insertions, 2 deletions
@@ -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 1fd37f76e..317c2780c 100644 --- 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 49ff9937f..1fff6384f 100644 --- 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, |