diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/ephy-notebook.c | 9 |
2 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2004-03-06 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-notebook.c: (notebook_drag_data_received_cb): + + Fix crash when dragging a link to a tab label; I forgot to change + this making the recent EphyTab/EphyEmbed changes. + +2004-03-06 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/mozilla-embed.cpp: Also pop up the context menu with the menu key. diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c index 1a6d65cc8..277010e07 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -626,11 +626,10 @@ ephy_notebook_switch_page_cb (GtkNotebook *notebook, static void notebook_drag_data_received_cb (GtkWidget* widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, - guint info, guint time, GtkWidget *child) + guint info, guint time, EphyTab *tab) { EphyEmbed *embed = NULL; EphyWindow *window = NULL; - EphyTab *tab = NULL; GtkWidget *toplevel; GList *uris = NULL, *l; GnomeVFSURI *uri; @@ -670,10 +669,10 @@ notebook_drag_data_received_cb (GtkWidget* widget, GdkDragContext *context, g_return_if_fail (EPHY_IS_WINDOW (toplevel)); window = EPHY_WINDOW (toplevel); - if (child) + if (tab != NULL); { - embed = EPHY_EMBED (child); - tab = ephy_tab_for_embed (embed); + embed = ephy_tab_get_embed (tab); + g_return_if_fail (EPHY_IS_EMBED (embed)); } l = uris; |