aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--src/bookmarks/ephy-bookmarksbar.c4
-rwxr-xr-xsrc/toolbar.c4
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 154528fc0..d1e7dd2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2004-06-23 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmarksbar.c:
+ (ephy_bookmarksbar_set_window):
+ * src/toolbar.c: (toolbar_realize):
+
+ Use g_signal_connect_after to connect to the toolbar_added
+ signal, otherwise the toolbar isn't created yet and we crash
+ when trying to set the drag dests on a newly added toolbar.
+
+2004-06-23 Christian Persch <chpe@cvs.gnome.org>
+
* doc/reference/tmpl/ephy-permission-manager.sgml:
* embed/ephy-permission-manager.c: (ephy_permission_info_new),
(ephy_permission_info_copy), (ephy_permission_manager_add),
diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index 1d666c0c4..3855090cc 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -297,8 +297,8 @@ ephy_bookmarksbar_set_window (EphyBookmarksBar *toolbar,
"ToolbarsModel", model,
NULL);
- g_signal_connect (model, "toolbar_added",
- G_CALLBACK (toolbar_added_cb), toolbar);
+ g_signal_connect_after (model, "toolbar_added",
+ G_CALLBACK (toolbar_added_cb), toolbar);
/* now that the toolbar has been constructed, set drag dests */
n_toolbars = egg_toolbars_model_n_toolbars (model);
diff --git a/src/toolbar.c b/src/toolbar.c
index cf6596f32..16981fb02 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -207,8 +207,8 @@ toolbar_realize (GtkWidget *widget)
GTK_WIDGET_CLASS (parent_class)->realize (widget);
- g_signal_connect (model, "toolbar_added",
- G_CALLBACK (toolbar_added_cb), toolbar);
+ g_signal_connect_after (model, "toolbar_added",
+ G_CALLBACK (toolbar_added_cb), toolbar);
/* now that the toolbar has been constructed, set drag dests */
n_toolbars = egg_toolbars_model_n_toolbars (model);