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

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-06-01 14:23:03 +0300 (Fri, 01 Jun 2007)
New Revision: 12035

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-window.c
Log:
When destroying the window, remove (if exists) the escape timeout handler.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-06-01 11:19:43 UTC (rev 12034)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-06-01 11:23:03 UTC (rev 12035)
@@ -1,5 +1,10 @@
 2007-06-01  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* src/hildon-window.c: When destroying the window, remove (if exists) the
+	escape timeout handler. Fixes #NB59276.
+
+2007-06-01  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* src/hildon-banner.c: When realizing the widget, set the window
 	transiency. Setting the transiency in the gobject constructor is not
 	good, as the widget is not realized at that point. Fixes: #NB56624.

Modified: projects/haf/trunk/hildon-1/src/hildon-window.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-window.c	2007-06-01 11:19:43 UTC (rev 12034)
+++ projects/haf/trunk/hildon-1/src/hildon-window.c	2007-06-01 11:23:03 UTC (rev 12035)
@@ -380,6 +380,11 @@
     
     self = HILDON_WINDOW (obj_self);
 
+    if (priv->escape_timeout) {
+      g_source_remove (priv->escape_timeout);
+      priv->escape_timeout = 0;
+    }
+
     g_free (priv->borders);
     g_free (priv->toolbar_borders);