AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 14:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Revert "GtkPlacesSidebar: support switching locations for XDS drag types"

Browse Source 
This reverts commit 588ffa8c32.
This commit is contained in:
Matthias Clasen 2013-10-23 15:55:14 -04:00
parent c9f8d22094
commit cf00c43154
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkplacessidebar.c
View File

@ -289,8 +289,7 @@ static void check_unmount_and_eject (GMount *mount,
/* Identifiers for target types */ /* Identifiers for target types */
enum { enum {
GTK_TREE_MODEL_ROW, GTK_TREE_MODEL_ROW,
TEXT_URI_LIST, TEXT_URI_LIST
XDND_DIRECT_SAVE
}; };
/* Target types for dragging from the shortcuts list */ /* Target types for dragging from the shortcuts list */
@ -301,8 +300,7 @@ static const GtkTargetEntry dnd_source_targets[] = {
/* Target types for dropping into the shortcuts list */ /* Target types for dropping into the shortcuts list */
static const GtkTargetEntry dnd_drop_targets [] = { static const GtkTargetEntry dnd_drop_targets [] = {
{ "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }, { "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 */ /* Drag and drop interface declarations */
@ -1593,12 +1591,10 @@ drag_motion_callback (GtkTreeView *tree_view,
GtkTreeIter iter; GtkTreeIter iter;
gboolean res; gboolean res;
gboolean drop_as_bookmarks; gboolean drop_as_bookmarks;
gboolean valid_xds_drag;
char *drop_target_uri = NULL; char *drop_target_uri = NULL;
action = 0; action = 0;
drop_as_bookmarks = FALSE; drop_as_bookmarks = FALSE;
valid_xds_drag = FALSE;
path = NULL; path = NULL;
if (!sidebar->drag_data_received) { if (!sidebar->drag_data_received) {
@ -1617,14 +1613,6 @@ drag_motion_callback (GtkTreeView *tree_view,
sidebar->drag_data_info == GTK_TREE_MODEL_ROW) { sidebar->drag_data_info == GTK_TREE_MODEL_ROW) {
/* Dragging bookmarks always moves them to another position in the bookmarks list */ /* Dragging bookmarks always moves them to another position in the bookmarks list */
action = GDK_ACTION_MOVE; 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 { } else {
/* URIs are being dragged. See if the caller wants to handle a /* URIs are being dragged. See if the caller wants to handle a
* file move/copy operation itself, or if we should only try to * file move/copy operation itself, or if we should only try to
@ -1667,7 +1655,7 @@ drag_motion_callback (GtkTreeView *tree_view,
} }
out: out:
if (action != 0 || valid_xds_drag) { if (action != 0) {
check_switch_location_timer (sidebar, drop_target_uri); check_switch_location_timer (sidebar, drop_target_uri);
start_drop_feedback (sidebar, path, pos, drop_as_bookmarks); start_drop_feedback (sidebar, path, pos, drop_as_bookmarks);
} else { } else {