Merge lp:~toabctl/overlay-scrollbar/fix-1058205-for-ubuntu into lp:~ubuntu-desktop/overlay-scrollbar/ubuntu

[Thomas Bechtold]

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-25 11:13:24 +0000
+++ debian/changelog	2012-10-04 19:44:21 +0000
@@ -1,3 +1,9 @@
+overlay-scrollbar (0.2.16+r357-0ubuntu1) UNRELEASED; urgency=low
+
+  * Updated to r357, fixes memory leak (lp: #1058205)
+
+ -- Thomas Bechtold <[e-mail]>  Thu, 04 Oct 2012 21:36:57 +0200
+
 overlay-scrollbar (0.2.16+r356-0ubuntu2) quantal-proposed; urgency=low
 
   * Reuploaded now that gtk2 has a fix for it
 
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-09-24 14:25:40 +0000
+++ os/os-scrollbar.c	2012-10-04 19:44:21 +0000
@@ -609,14 +609,28 @@
 }
 #endif
 
-/* Get the private struct. */
+/* destroy the private struct */
+static void
+destroy_private (gpointer priv)
+{
+  g_slice_free (OsScrollbarPrivate, priv);
+}
+
+/* Get the private struct. If there isn't one, return NULL */
+static OsScrollbarPrivate*
+lookup_private (GtkWidget *widget)
+{
+  return g_object_get_qdata (G_OBJECT (widget), os_quark_qdata);
+}
+
+/* Get the private struct. If there isn't one, create it */
 static OsScrollbarPrivate*
 get_private (GtkWidget *widget)
 {
   OsScrollbarPrivate *priv;
 
   /* Fetch the private qdata struct. */
-  priv = g_object_get_qdata (G_OBJECT (widget), os_quark_qdata);
+  priv = lookup_private (widget);
 
   if (!priv)
     {
@@ -667,7 +681,7 @@
                                            scrolling_cb, scrolling_end_cb, widget);
 
       /* Store qdata. */
-      g_object_set_qdata (G_OBJECT (widget), os_quark_qdata, qdata);
+      g_object_set_qdata_full (G_OBJECT (widget), os_quark_qdata, qdata, destroy_private);
       priv = qdata;
 
       /* Create adjustment and thumb. */
@@ -3175,31 +3189,6 @@
       OsScrollbarPrivate *priv;
 
       scrollbar = GTK_SCROLLBAR (object);
-      priv = get_private (GTK_WIDGET (scrollbar));
-
-      if (priv->source_deactivate_bar_id != 0)
-        {
-          g_source_remove (priv->source_deactivate_bar_id);
-          priv->source_deactivate_bar_id = 0;
-        }
-
-      if (priv->source_hide_thumb_id != 0)
-        {
-          g_source_remove (priv->source_hide_thumb_id);
-          priv->source_hide_thumb_id = 0;
-        }
-
-      if (priv->source_show_thumb_id != 0)
-        {
-          g_source_remove (priv->source_show_thumb_id);
-          priv->source_show_thumb_id = 0;
-        }
-
-      if (priv->source_unlock_thumb_id != 0)
-        {
-          g_source_remove (priv->source_unlock_thumb_id);
-          priv->source_unlock_thumb_id = 0;
-        }
 
       os_root_list = g_slist_remove (os_root_list, scrollbar);
 
@@ -3215,26 +3204,54 @@
                                     root_filter_func, NULL);
         }
 
-      if (priv->animation != NULL)
-        {
-          g_object_unref (priv->animation);
-          priv->animation = NULL;
-        }
-
-      if (priv->bar != NULL)
-        {
-          g_object_unref (priv->bar);
-          priv->bar = NULL;
-        }
-
-      if (priv->window_group != NULL)
-        {
-          g_object_unref (priv->window_group);
-          priv->window_group = NULL;
-        }
-
-      swap_adjustment (scrollbar, NULL);
-      swap_thumb (scrollbar, NULL);
+      priv = lookup_private (GTK_WIDGET(scrollbar));
+      if (priv != NULL)
+        {
+          if (priv->source_deactivate_bar_id != 0)
+            {
+              g_source_remove (priv->source_deactivate_bar_id);
+              priv->source_deactivate_bar_id = 0;
+            }
+
+          if (priv->source_hide_thumb_id != 0)
+            {
+              g_source_remove (priv->source_hide_thumb_id);
+              priv->source_hide_thumb_id = 0;
+            }
+
+          if (priv->source_show_thumb_id != 0)
+            {
+              g_source_remove (priv->source_show_thumb_id);
+              priv->source_show_thumb_id = 0;
+            }
+
+          if (priv->source_unlock_thumb_id != 0)
+            {
+              g_source_remove (priv->source_unlock_thumb_id);
+              priv->source_unlock_thumb_id = 0;
+            }
+
+          if (priv->animation != NULL)
+            {
+              g_object_unref (priv->animation);
+              priv->animation = NULL;
+            }
+
+          if (priv->bar != NULL)
+            {
+              g_object_unref (priv->bar);
+              priv->bar = NULL;
+            }
+
+          if (priv->window_group != NULL)
+            {
+              g_object_unref (priv->window_group);
+              priv->window_group = NULL;
+            }
+
+          swap_adjustment (scrollbar, NULL);
+          swap_thumb (scrollbar, NULL);
+        }
     }
 
   (* pre_hijacked_scrollbar_dispose) (object);