aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-06-28 19:46:08 +0800
committerXan Lopez <xan@igalia.com>2012-06-28 19:46:08 +0800
commitf0dbb1fbd548724dbce3ded8b3c3f8a695d5533e (patch)
tree4f601b73707cb784aef9c6684a3cbd3bc522ee59
parent1a61db4aa5839d921f96727c3c464f6b026221c4 (diff)
downloadgsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.tar
gsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.tar.gz
gsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.tar.bz2
gsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.tar.lz
gsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.tar.xz
gsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.tar.zst
gsoc2013-epiphany-f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e.zip
ephy-web-view: unref objects in dispose, not finalize
-rw-r--r--embed/ephy-web-view.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 51509b104..a6c28f097 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -522,6 +522,8 @@ ephy_web_view_dispose (GObject *object)
g_clear_object (&priv->file_monitor);
+ g_clear_object (&priv->icon);
+
if (priv->history_service_cancellable) {
g_cancellable_cancel (priv->history_service_cancellable);
g_clear_object (&priv->history_service_cancellable);
@@ -1083,11 +1085,6 @@ ephy_web_view_finalize (GObject *object)
ephy_web_view_history_cleared_cb,
EPHY_WEB_VIEW (object));
- if (priv->icon != NULL) {
- g_object_unref (priv->icon);
- priv->icon = NULL;
- }
-
if (priv->non_search_regex != NULL) {
g_regex_unref (priv->non_search_regex);
priv->non_search_regex = NULL;