aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-02-02 03:40:51 +0800
committerChristian Persch <chpe@src.gnome.org>2005-02-02 03:40:51 +0800
commitc0d392cbae39f50fd029c58fac14a95b5a5f2cc3 (patch)
tree900e64fae9878f375e0c7cb88bad5fe84bb6731d
parent6345432b15c7ce20dad3844d72592e8ecbbe1577 (diff)
downloadgsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.tar
gsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.tar.gz
gsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.tar.bz2
gsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.tar.lz
gsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.tar.xz
gsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.tar.zst
gsoc2013-epiphany-c0d392cbae39f50fd029c58fac14a95b5a5f2cc3.zip
Don't weak ref the shell when it's finalised already. Fixes bug #165542.
2005-02-01 Christian Persch <chpe@cvs.gnome.org> * 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.
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-main.c2
-rw-r--r--src/ephy-shell.c1
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d5636671..2d19907fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-02-01 Christian Persch <chpe@cvs.gnome.org>
+ * 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 <chpe@cvs.gnome.org>
+
* lib/widgets/ephy-location-entry.c: (entry_populate_popup_cb):
Set "Clear" context menu entry insensitive in lockdown mode.
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);
}