[libyelp/yelp-view] Manage and disconnect GtkAdjustment signal handlers

1 files changed, 22 insertions, 4 deletions

diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index 89eb36bd..01ec1b98 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -184,6 +184,8 @@ struct _YelpViewPrivate {
     GtkAdjustment *hadjustment;
     gdouble        vadjust;
     gdouble        hadjust;
+    gulong         vadjuster;
+    gulong         hadjuster;
 
     gchar         *popup_link_uri;
 
@@ -247,6 +249,16 @@ yelp_view_dispose (GObject *object)
         priv->uri = NULL;
     }
 
+    if (priv->vadjuster > 0) {
+        g_source_remove (priv->vadjuster);
+        priv->vadjuster = 0;
+    }
+
+    if (priv->hadjuster > 0) {
+        g_source_remove (priv->hadjuster);
+        priv->hadjuster = 0;
+    }
+
     if (priv->cancellable) {
         g_cancellable_cancel (priv->cancellable);
         g_object_unref (priv->cancellable);
@@ -603,14 +615,20 @@ view_scroll_adjustments (YelpView      *view,
 {
     YelpViewPrivate *priv = GET_PRIV (view);
     priv->vadjustment = vadj;
+    if (priv->vadjuster > 0)
+        g_source_remove (priv->vadjuster);
+    priv->vadjuster = 0;
     if (vadj) {
-        g_signal_connect (vadj, "value-changed",
-                          G_CALLBACK (view_scrolled), view);
+        priv->vadjuster = g_signal_connect (vadj, "value-changed",
+                                            G_CALLBACK (view_scrolled), view);
     }
     priv->hadjustment = hadj;
+    if (priv->hadjuster > 0)
+        g_source_remove (priv->hadjuster);
+    priv->hadjuster = 0;
     if (hadj) {
-        g_signal_connect (hadj, "value-changed",
-                          G_CALLBACK (view_scrolled), view);
+        priv->hadjuster = g_signal_connect (hadj, "value-changed",
+                                            G_CALLBACK (view_scrolled), view);
     }
 }