From 1853f8251a60b50a3719b147571aaac88df8a1eb Mon Sep 17 00:00:00 2001 From: Jorn Baayen Date: Fri, 14 Jan 2005 00:58:26 +0000 Subject: Add GDK_ACTION_ASK, and prefer _NETSCAPE_URL over uri-list drag types. 2005-01-14 Jorn Baayen * 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. --- src/bookmarks/ephy-bookmark-action.c | 5 +++-- src/bookmarks/ephy-bookmarks-editor.c | 6 +++--- src/ephy-history-window.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src') 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); diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 1420a880c..933bd2337 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -70,9 +70,9 @@ static GtkTargetEntry page_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_page_drag_types = G_N_ELEMENTS (page_drag_types); -- cgit v1.2.3