Attachment 612752 Details for Bug 857348 – Disconnect signals when finalizing htmlview

[patch] Disconnect signals when finalizing htmlview

liferea-1.8.6-disconnect-htmlview-signals.patch (text/plain), 2.21 KB, created by Fabrice Bellet on 2012-09-14 07:44:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2012-09-14 07:44:45 UTC

Size: 2.21 KB

patch

obsolete

>--- liferea-1.8.6/src/ui/liferea_htmlview.c.orig	2012-06-15 14:09:08.000000000 +0200
>+++ liferea-1.8.6/src/ui/liferea_htmlview.c	2012-08-14 22:59:37.659281390 +0200
>@@ -55,6 +55,8 @@ struct LifereaHtmlViewPrivate {
> 	gboolean	forceInternalBrowsing;	/**< TRUE if clicked links should be force loaded within this view (regardless of global preference) */
> 	
> 	htmlviewImplPtr impl;			/**< browser widget support implementation */
>+        gulong          online_status_changed_id;
>+        gulong          proxy_changed_id;
> };
> 
> enum {
>@@ -77,6 +79,13 @@ G_DEFINE_TYPE (LifereaHtmlView, liferea_
> static void
> liferea_htmlview_finalize (GObject *object)
> {
>+        LifereaHtmlView *htmlview = LIFEREA_HTMLVIEW (object);
>+
>+        g_signal_handler_disconnect (network_monitor_get(),
>+                htmlview->priv->proxy_changed_id);
>+        g_signal_handler_disconnect (network_monitor_get(),
>+                htmlview->priv->online_status_changed_id);
>+
> 	G_OBJECT_CLASS (parent_class)->finalize (object);
> }
> 
>@@ -124,7 +133,6 @@ liferea_htmlview_class_init (LifereaHtml
> 		G_TYPE_NONE,
> 		1,
> 		G_TYPE_STRING);
>-
> 	htmlview_get_impl ()->init ();
> 
> 	g_type_class_add_private (object_class, sizeof (LifereaHtmlViewPrivate));
>@@ -175,12 +183,14 @@ liferea_htmlview_new (gboolean forceInte
> 
> 	liferea_htmlview_clear (htmlview);
> 	
>-	g_signal_connect (network_monitor_get (), "online-status-changed",
>-	                  G_CALLBACK (liferea_htmlview_online_status_changed),
>-	                  htmlview);
>-	g_signal_connect (network_monitor_get (), "proxy-changed",
>-	                  G_CALLBACK (liferea_htmlview_proxy_changed),
>-	                  htmlview);
>+        htmlview->priv->online_status_changed_id = 
>+            g_signal_connect (network_monitor_get (), "online-status-changed",
>+                              G_CALLBACK (liferea_htmlview_online_status_changed),
>+                              htmlview);
>+        htmlview->priv->proxy_changed_id =
>+            g_signal_connect (network_monitor_get (), "proxy-changed",
>+                              G_CALLBACK (liferea_htmlview_proxy_changed),
>+                              htmlview);
> 
> 	if (NULL != network_get_proxy_host ()) {
> 		debug0 (DEBUG_NET, "Setting initial HTML widget proxy...");

Actions: View | Diff

Attachments on bug 857348: 612752