Merge lp:~cimi/overlay-scrollbar/fix-754927 into lp:overlay-scrollbar

[Andrea Cimitan]

simply add parent =! NULL check

[lp:~cimi/overlay-scrollbar/fix-754927]

208. By Andrea Cimitan on 2011-04-13

check if priv->animation != NULL

[David Barth (dbarth)]

The changes are ok here, but I think there's more to the bug.

1. the user_data may contain a dead pointer, so even getting access to ->priv may fail
2. in order to avoid dead pointers still reaching the callback, shouldn't you disconnect the animation signal as well on dispose?

review: Needs Information

[Andrea Cimitan (cimi)]

1. when user_data is NULL then the animation should be already stopped, in fact in (...)
2. (...) dispose I am running at first g_object_unref (priv->animation), and os-animation on dispose signal is taking care or stopping the animation itself.

A quick opinion of loic could be enough, though I think this should be fine

[Andrea Cimitan (cimi)]

I merged by mistake (I backported that in a branch I was testing, and I pushed that branch with the changes inside).
I could continue developing, though

[Loïc Molinari (loic.molinari)]

1) The design ensures the pager is alive all along the animation lifetime.

2) The pager destroys the animation object when it's disposed and I confirm the animation object takes care of removing the source from the mainloop when it's disposed.

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

 review approve

review: Approve

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-04-08 21:08:32 +0000
+++ os/os-pager.c	2011-04-13 09:56:17 +0000
@@ -128,6 +128,9 @@
 
   priv->weight = weight;
 
+  if (priv->parent == NULL)
+    return;
+
   os_pager_draw (pager);
 }
 
@@ -196,8 +199,10 @@
   pager = OS_PAGER (user_data);
   priv = pager->priv;
 
-  if (priv->parent != NULL && priv->pager_window != NULL)
-    os_pager_draw (pager);
+  if (priv->parent == NULL || priv->pager_window == NULL)
+    return;
+
+  os_pager_draw (pager);
 }
 
 /* Type definition. */
@@ -411,6 +416,10 @@
 
   priv = pager->priv;
 
+  /* stop currently running animation. */
+  if (priv->animation != NULL)
+    os_animation_stop (priv->animation);
+
   if (priv->parent != NULL)
     {
       g_object_unref (priv->parent);