diff options
| author | Nelson Benítez León <nbenitezl+gnome@gmail.com> | 2013-09-07 11:01:33 +0200 |
|---|---|---|
| committer | Nelson Benítez León <nbenitezl+gnome@gmail.com> | 2013-10-23 20:20:33 +0200 |
| commit | 588ffa8c3241eff2f8e2d99b911a6bcb539347bd (patch) | |
| tree | ee52e20ef433f7d61b05262f512296a7061e3576 /gtk/gtkplacessidebar.c | |
| parent | e4bb02f8ae698facc204c616108cc8f4c3b579bc (diff) | |
| download | gtk+-588ffa8c3241eff2f8e2d99b911a6bcb539347bd.tar.gz | |
GtkPlacesSidebar: support switching locations for XDS drag types
Make GtkPlacesSidebar also change locations when hovered
by XDS dnd targets (eg. dragging a file from file-roller).
Part of bug 707679
Diffstat (limited to 'gtk/gtkplacessidebar.c')
| -rw-r--r-- | gtk/gtkplacessidebar.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index b93f7f4dbf..8dcca81a7c 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -289,7 +289,8 @@ static void check_unmount_and_eject (GMount *mount, /* Identifiers for target types */ enum { GTK_TREE_MODEL_ROW, - TEXT_URI_LIST + TEXT_URI_LIST, + XDND_DIRECT_SAVE }; /* Target types for dragging from the shortcuts list */ @@ -300,7 +301,8 @@ static const GtkTargetEntry dnd_source_targets[] = { /* Target types for dropping into the shortcuts list */ static const GtkTargetEntry dnd_drop_targets [] = { { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }, - { "text/uri-list", 0, TEXT_URI_LIST } + { "text/uri-list", 0, TEXT_URI_LIST }, + { "XdndDirectSave0", 0, XDND_DIRECT_SAVE } /* XDS Protocol Type */ }; /* Drag and drop interface declarations */ @@ -1591,10 +1593,12 @@ drag_motion_callback (GtkTreeView *tree_view, GtkTreeIter iter; gboolean res; gboolean drop_as_bookmarks; + gboolean valid_xds_drag; char *drop_target_uri = NULL; action = 0; drop_as_bookmarks = FALSE; + valid_xds_drag = FALSE; path = NULL; if (!sidebar->drag_data_received) { @@ -1613,6 +1617,14 @@ drag_motion_callback (GtkTreeView *tree_view, sidebar->drag_data_info == GTK_TREE_MODEL_ROW) { /* Dragging bookmarks always moves them to another position in the bookmarks list */ action = GDK_ACTION_MOVE; + } else if (sidebar->drag_data_received && + sidebar->drag_data_info == XDND_DIRECT_SAVE) { + gtk_tree_model_get_iter (GTK_TREE_MODEL (sidebar->store), &iter, path); + gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), + &iter, + PLACES_SIDEBAR_COLUMN_URI, &drop_target_uri, + -1); + valid_xds_drag = TRUE; } else { /* URIs are being dragged. See if the caller wants to handle a * file move/copy operation itself, or if we should only try to @@ -1655,7 +1667,7 @@ drag_motion_callback (GtkTreeView *tree_view, } out: - if (action != 0) { + if (action != 0 || valid_xds_drag) { check_switch_location_timer (sidebar, drop_target_uri); start_drop_feedback (sidebar, path, pos, drop_as_bookmarks); } else { |