r3389 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/common

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-12 10:31:54 +0100 (Mon, 12 Nov 2007)
New Revision: 3389

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
Log:
Patch by: Milko Krachounov <exabyte at 3mhz.net>

* src/common/moko-dialer-panel.c: (moko_dialer_panel_hold_timeout),
(moko_dialer_panel_pressed): Automatically free the allocated data
structure when the timeout source is
destroyed


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-10 18:09:39 UTC (rev 3388)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-12 09:31:54 UTC (rev 3389)
@@ -1,3 +1,12 @@
+2007-11-12  Thomas Wood  <thomas at openedhand.com>
+
+	Patch by: Milko Krachounov <exabyte at 3mhz.net>
+
+	* src/common/moko-dialer-panel.c: (moko_dialer_panel_hold_timeout),
+	(moko_dialer_panel_pressed): Automatically free the allocated data
+	structure when the timeout source is
+	destroyed
+
 2007-11-05  Thomas Wood  <thomas at openedhand.com>
 
 	* src/phone-kit/moko-dialer.c: (moko_dialer_dial),

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c	2007-11-10 18:09:39 UTC (rev 3388)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c	2007-11-12 09:31:54 UTC (rev 3389)
@@ -154,7 +154,6 @@
 {
   g_signal_emit (data->panel, moko_dialer_panel_signals[HOLD_SIGNAL], 0, data->value);
 
-  g_free (data);
   return FALSE;
 }
 
@@ -186,7 +185,7 @@
     timeout_data->panel = panel;
     timeout_data->value = value;
 
-    hold_timeout_source = g_timeout_add (800, (GSourceFunc) moko_dialer_panel_hold_timeout, timeout_data);
+    hold_timeout_source = g_timeout_add_full (G_PRIORITY_DEFAULT, 800, (GSourceFunc) moko_dialer_panel_hold_timeout, timeout_data, (GDestroyNotify) g_free);
 
   }
   else if (event->type == GDK_BUTTON_RELEASE)