aboutsummaryrefslogtreecommitdiffstats
path: root/lib
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 /lib
parentb79a2ee8d325de52aa792123256a9d70a1ef4ee9 (diff)
downloadgsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar
gsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar.gz
gsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar.bz2
gsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar.lz
gsoc2013-epiphany-1853f8251a60b50a3719b147571aaac88df8a1eb.tar.xz
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 'lib')
-rw-r--r--lib/widgets/ephy-location-entry.c8
-rw-r--r--lib/widgets/ephy-node-view.c2
2 files changed, 5 insertions, 5 deletions
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);