diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-06-11 05:21:36 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-06-11 05:21:36 +0800 |
| commit | 55bcddfd18577f6363842ad3b1772e0db9f1c011 (patch) | |
| tree | 8d9902be38c7d2b19072106bac9a5f840acd2660 /embed/mozilla/mozilla-embed.cpp | |
| parent | 525eb97bca09bc9a4abe3925f70c3fc5a485f3f7 (diff) | |
| download | gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.tar gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.tar.gz gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.tar.bz2 gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.tar.lz gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.tar.xz gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.tar.zst gsoc2013-epiphany-55bcddfd18577f6363842ad3b1772e0db9f1c011.zip | |
Common helper function to unref a GObject from idle.
2005-06-10 Christian Persch <chpe@cvs.gnome.org>
* lib/Makefile.am:
* lib/ephy-object-helpers.c:
* lib/ephy-object-helpers.h:
Common helper function to unref a GObject from idle.
* embed/downloader-view.c: (downloader_view_finalize):
* embed/mozilla/mozilla-embed-find.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed.cpp:
* src/ephy-extensions-manager.c: (unload_extension):
* src/ephy-main.c: (main):
* src/ephy-shell.c: (toolwindow_hide_cb):
* src/ephy-window.c: (ephy_window_finalize):
Always unref the shell from idle, never directly. That's because
in case we hold the last reference, we would end up terminating
embedding/XPCOM from a mozilla callback. Fixes bug #151037,
and moz#236688.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 8a9d3aadc..1b7733e0d 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -29,6 +29,7 @@ #include "ephy-embed-shell.h" #include "ephy-command-manager.h" #include "ephy-string.h" +#include "ephy-object-helpers.h" #include "ephy-debug.h" #include "EphyBrowser.h" @@ -201,6 +202,8 @@ static GObject * mozilla_embed_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_params) { + g_object_ref (embed_shell); + /* we depend on single because of mozilla initialization */ ephy_embed_shell_get_embed_single (embed_shell); @@ -289,6 +292,8 @@ mozilla_embed_finalize (GObject *object) } G_OBJECT_CLASS (parent_class)->finalize (object); + + ephy_object_idle_unref (embed_shell); } static void @@ -1127,6 +1132,8 @@ _mozilla_embed_new_xul_dialog (void) { GtkWidget *window, *embed; + g_object_ref (embed_shell); + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); embed = gtk_moz_embed_new (); gtk_widget_show (embed); @@ -1148,5 +1155,8 @@ _mozilla_embed_new_xul_dialog (void) G_CALLBACK (xul_title_cb), window, (GConnectFlags) 0); + g_object_weak_ref (G_OBJECT (window), + (GWeakNotify) ephy_object_idle_unref, embed_shell); + return GTK_MOZ_EMBED (embed); } |