diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | lib/widgets/ephy-location-entry.c | 8 | ||||
| -rw-r--r-- | lib/widgets/ephy-node-view.c | 2 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmark-action.c | 5 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 6 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 6 |
6 files changed, 28 insertions, 13 deletions
@@ -1,3 +1,17 @@ +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. + 2005-01-14 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmark-action.c: (show_context_menu): diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index bd131f27a..39d614a45 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -88,9 +88,9 @@ web_prefixes [] = static GtkTargetEntry url_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_url_drag_types = G_N_ELEMENTS (url_drag_types); @@ -532,7 +532,7 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry) gtk_box_pack_start (GTK_BOX (hbox), priv->icon_ebox, FALSE, FALSE, 2); gtk_drag_source_set (priv->icon_ebox, GDK_BUTTON1_MASK, url_drag_types, n_url_drag_types, - GDK_ACTION_COPY); + GDK_ACTION_ASK | GDK_ACTION_COPY | GDK_ACTION_LINK); gtk_tooltips_set_tip (priv->tips, priv->icon_ebox, _("Drag and drop this icon to create a link to this page"), NULL); diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index b72c6fcb4..5f01667d7 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -738,7 +738,7 @@ motion_notify_cb (GtkWidget *widget, { context = gtk_drag_begin (widget, view->priv->source_target_list, - GDK_ACTION_COPY, + GDK_ACTION_ASK | GDK_ACTION_COPY | GDK_ACTION_LINK, view->priv->drag_button, (GdkEvent*)event); 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); |