From c0d392cbae39f50fd029c58fac14a95b5a5f2cc3 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 1 Feb 2005 19:40:51 +0000 Subject: Don't weak ref the shell when it's finalised already. Fixes bug #165542. 2005-02-01 Christian Persch * src/ephy-main.c: (main): * src/ephy-shell.c: (ephy_shell_finalize): Don't weak ref the shell when it's finalised already. Fixes bug #165542. --- ChangeLog | 8 ++++++++ src/ephy-main.c | 2 +- src/ephy-shell.c | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0d5636671..2d19907fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-02-01 Christian Persch + + * src/ephy-main.c: (main): + * src/ephy-shell.c: (ephy_shell_finalize): + + Don't weak ref the shell when it's finalised already. + Fixes bug #165542. + 2005-02-01 Christian Persch * lib/widgets/ephy-location-entry.c: (entry_populate_popup_cb): diff --git a/src/ephy-main.c b/src/ephy-main.c index 2a02abc81..de6350cf7 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -208,7 +208,7 @@ main (int argc, char *argv[]) GTK_MESSAGE_ERROR, err->message); gtk_dialog_run (GTK_DIALOG (dialog)); } - else if (new_instance) + else if (new_instance && ephy_shell) { g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL); g_idle_add ((GSourceFunc) idle_unref, ephy_shell); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 9af0c98e5..619e64335 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -539,6 +539,7 @@ ephy_shell_finalize (GObject *object) { eel_gconf_notification_remove (shell->priv->toolbar_style_notifier_id); } + if (shell->priv->toolbars_model) { g_object_unref (shell->priv->toolbars_model); } -- cgit v1.2.3