aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorJorn Baayen <jbaayen@gnome.org>2005-01-14 08:58:26 +0800
committerJorn Baayen <jbaayen@src.gnome.org>2005-01-14 08:58:26 +0800
commit1853f8251a60b50a3719b147571aaac88df8a1eb (patch)
tree9cc8837f0525a1cbac38aed2149cb7f70a5c192a /src/bookmarks
parentb79a2ee8d325de52aa792123256a9d70a1ef4ee9 (diff)
downloadgsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar.gz
gsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar.zst
gsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.zip
Add GDK_ACTION_ASK, and prefer _NETSCAPE_URL over uri-list drag types.
2005-01-14 Jorn Baayen <jbaayen@gnome.org> * lib/widgets/ephy-location-entry.c: (ephy_location_entry_construct_contents): * lib/widgets/ephy-node-view.c: (motion_notify_cb): * src/bookmarks/ephy-bookmark-action.c: (drag_motion_cb): * src/bookmarks/ephy-bookmarks-editor.c: * src/ephy-history-window.c: Add GDK_ACTION_ASK, and prefer _NETSCAPE_URL over uri-list drag types. This is to match the new Nautilus _NETSCAPE_URL DnD behaviour. Fixes #163937.
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmark-action.c5
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index ea4e96e40..f219853d6 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -488,8 +488,9 @@ drag_motion_cb (GtkWidget *widget, GdkEventMotion *event, EphyBookmarkAction *ac
target_list = gtk_target_list_new (drag_targets, n_drag_targets);
stop_drag_check (action, widget);
- gtk_drag_begin (widget, target_list, GDK_ACTION_MOVE |
- GDK_ACTION_COPY, 1, (GdkEvent*)event);
+ gtk_drag_begin (widget, target_list, GDK_ACTION_ASK |
+ GDK_ACTION_MOVE | GDK_ACTION_COPY, 1,
+ (GdkEvent*)event);
gtk_target_list_unref (target_list);
}
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 36d7d9303..f3db7c5e6 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -76,9 +76,9 @@ static int n_topic_drag_dest_types = G_N_ELEMENTS (topic_drag_dest_types);
static GtkTargetEntry bmk_drag_types [] =
{
- { EPHY_DND_URI_LIST_TYPE, 0, 0 },
- { EPHY_DND_TEXT_TYPE, 0, 1 },
- { EPHY_DND_URL_TYPE, 0, 2 }
+ { EPHY_DND_URL_TYPE, 0, 0 },
+ { EPHY_DND_URI_LIST_TYPE, 0, 1 },
+ { EPHY_DND_TEXT_TYPE, 0, 2 }
};
static int n_bmk_drag_types = G_N_ELEMENTS (bmk_drag_types);