aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--src/bookmarks/ephy-bookmark-action.c3
-rw-r--r--src/ephy-notebook.c2
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f9a6bd22..a74429e68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-05 Marco Pesenti Gritti <marco@gnome.org>
+
+ * src/bookmarks/ephy-bookmark-action.c: (drag_motion_cb):
+
+ Support also GDK_ACTION_COPY. Fix #145254.
+
+ * src/ephy-notebook.c: (notebook_drag_data_received_cb):
+
+ Use the notebook to access the toplevel, data passed to the
+ signal can be NULL.
+
2004-07-05 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphySingle.cpp:
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index aa56072cb..19859f2b5 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -435,7 +435,8 @@ 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, 1, (GdkEvent*)event);
+ gtk_drag_begin (widget, target_list, GDK_ACTION_MOVE |
+ GDK_ACTION_COPY, 1, (GdkEvent*)event);
}
return TRUE;
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index e09543f72..e55fdc03f 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -629,7 +629,7 @@ notebook_drag_data_received_cb (GtkWidget* widget, GdkDragContext *context,
{
EphyWindow *window;
- window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tab)));
+ window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (widget)));
ephy_window_load_in_tabs (window, tab, uri_list);
gnome_vfs_uri_list_free (uri_list);