[epiphany] ephy-web-view: unref objects in dispose, not finalize



commit f0dbb1fbd548724dbce3ded8b3c3f8a695d5533e
Author: Xan Lopez <xan igalia com>
Date:   Thu Jun 28 13:46:08 2012 +0200

    ephy-web-view: unref objects in dispose, not finalize

 embed/ephy-web-view.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 51509b1..a6c28f0 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;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]