[maemo-commits] [maemo-commits] r15315 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-03-19 18:05:18 +0200 (Wed, 19 Mar 2008)
New Revision: 15315

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-banner.c
Log:
2008-03-19  Sven Herzberg  <sven at imendio.com>

	Fixes: NB#22072: Revisiting fix for "Implement robust timer handling
	in Info Banner" bug

	* src/hildon-banner.c: (hildon_banner_timeout): reset the current
	timeout id properly when the timeout will disappear this leaves no
	artifacts around in the destroy(); there will only be the timeout
	created by hildon_banner_ensure_timeout() and adding a new timeout
	will also work if the timeout gets removed because the timeout_handler
	returned FALSE


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-03-19 15:56:58 UTC (rev 15314)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-03-19 16:05:18 UTC (rev 15315)
@@ -1,3 +1,15 @@
+2008-03-19  Sven Herzberg  <sven at imendio.com>
+
+	Fixes: NB#22072: Revisiting fix for "Implement robust timer handling
+	in Info Banner" bug
+
+	* src/hildon-banner.c: (hildon_banner_timeout): reset the current
+	timeout id properly when the timeout will disappear this leaves no
+	artifacts around in the destroy(); there will only be the timeout
+	created by hildon_banner_ensure_timeout() and adding a new timeout
+	will also work if the timeout gets removed because the timeout_handler
+	returned FALSE
+
 2008-03-19  Michael Natterer  <mitch at imendio.com>
 
 	Fixes: NB#79791: Cannot set focus to Master volume using stylus

Modified: projects/haf/trunk/hildon-1/src/hildon-banner.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-banner.c	2008-03-19 15:56:58 UTC (rev 15314)
+++ projects/haf/trunk/hildon-1/src/hildon-banner.c	2008-03-19 16:05:18 UTC (rev 15315)
@@ -303,8 +303,11 @@
         gdk_event_free (event);
     }
 
-    if (! continue_timeout)
+    if (! continue_timeout) {
+        HildonBannerPrivate *priv = HILDON_BANNER_GET_PRIVATE (self);
+        priv->timeout_id = 0;
         gtk_widget_destroy (widget);
+    }
 
     g_object_unref (widget);