diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-01-06 18:38:03 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-01-06 18:38:03 +0800 |
| commit | b64094100a910ba2068d3cb64c1595dc02d795d2 (patch) | |
| tree | 572ee8c5c91e353281000b844f637bd8a36f52c3 /embed/mozilla/mozilla-embed.cpp | |
| parent | ae767a6174e353acb3b1a850fdefdffebeec9817 (diff) | |
| download | gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.tar gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.tar.gz gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.tar.bz2 gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.tar.lz gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.tar.xz gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.tar.zst gsoc2013-epiphany-b64094100a910ba2068d3cb64c1595dc02d795d2.zip | |
Make sure event listener is ever attached. Never allow to override
2003-01-06 Marco Pesenti Gritti <marco@it.gnome.org>
* TODO:
* embed/mozilla/EphyWrapper.cpp:
* embed/mozilla/EphyWrapper.h:
* embed/mozilla/mozilla-embed.cpp:
* src/ephy-tab.c: (ephy_tab_init), (ephy_tab_link_message_cb),
(ephy_tab_get_status_message):
Make sure event listener is ever attached.
Never allow to override statusbar messages.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 8c39dd460..05408973f 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -382,6 +382,7 @@ static void mozilla_embed_destroy (GtkObject *object) { int i; + MozillaEmbed *embed = MOZILLA_EMBED (object); for (i = 0; signal_connections[i].event != NULL; i++) { @@ -390,6 +391,13 @@ mozilla_embed_destroy (GtkObject *object) (gpointer)signal_connections[i].func, (void *)object); } + + if (embed->priv->wrapper) + { + embed->priv->wrapper->Destroy(); + delete embed->priv->wrapper; + embed->priv->wrapper = NULL; + } GTK_OBJECT_CLASS (parent_class)->destroy (object); } @@ -406,14 +414,7 @@ mozilla_embed_finalize (GObject *object) g_return_if_fail (embed->priv != NULL); - if (embed->priv->wrapper) - { - embed->priv->wrapper->Destroy(); - delete embed->priv->wrapper; - embed->priv->wrapper = NULL; - } - - delete embed->priv; + g_free (embed->priv); G_OBJECT_CLASS (parent_class)->finalize (object); |