Make sure that all timeouts in HildonBanner are removed

* hildon/hildon-banner.c (hildon_banner_timeout):
Remove the timeout, if present, before setting it to 0.

Fixes: NB#141447 (HildonBanner crashes if a new one is shown
during a delete event)

diff --git a/ChangeLog b/ChangeLog
index e2f135d..43e76df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-01  Alberto Garcia  <agarcia@igalia.com>
+
+       * hildon/hildon-banner.c (hildon_banner_timeout):
+       Remove the timeout, if present, before setting it to 0.
+
+       Fixes: NB#141447 (HildonBanner crashes if a new one is shown
+       during a delete event)
+
 2009-09-30  Alberto Garcia  <agarcia@igalia.com>
 
        * hildon/hildon-banner.c (screen_size_changed):

diff --git a/hildon/hildon-banner.c b/hildon/hildon-banner.c
index cbfb263..54fab3c 100644 (file)
--- a/hildon/hildon-banner.c
+++ b/hildon/hildon-banner.c
@@ -306,7 +306,10 @@ hildon_banner_timeout                           (gpointer data)
 
     if (! continue_timeout) {
         HildonBannerPrivate *priv = HILDON_BANNER_GET_PRIVATE (data);
-        priv->timeout_id = 0;
+        if (priv->timeout_id) {
+            g_source_remove (priv->timeout_id);
+            priv->timeout_id = 0;
+        }
         gtk_widget_destroy (widget);
     }