r3895 - in trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory: . src

[chris at sita.openmoko.org]

Author: chris
Date: 2008-01-21 13:26:09 +0100 (Mon, 21 Jan 2008)
New Revision: 3895

Modified:
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c
Log:
        * src/openmoko-panel-memory.c: (memory_full_cb):
        Don't add multiple idles/try to remove non-existant ones


Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog	2008-01-21 11:29:18 UTC (rev 3894)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog	2008-01-21 12:26:09 UTC (rev 3895)
@@ -1,3 +1,8 @@
+2008-01-21  Chris Lord  <chris at openedhand.com>
+
+	* src/openmoko-panel-memory.c: (memory_full_cb):
+	Don't add multiple idles/try to remove non-existant ones
+
 2008-01-18  Chris Lord  <chris at openedhand.com>
 
 	* AUTHORS:

Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c	2008-01-21 11:29:18 UTC (rev 3894)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c	2008-01-21 12:26:09 UTC (rev 3895)
@@ -46,9 +46,11 @@
 	if (sim_full || phone_full) {
 		const gchar *message;
 		
-		gtk_widget_show (GTK_WIDGET (data->applet));
-		data->blink_idle = g_timeout_add_seconds (1,
-			(GSourceFunc)blink_idle, data);
+		if (!data->blink_idle) {
+			gtk_widget_show (GTK_WIDGET (data->applet));
+			data->blink_idle = g_timeout_add_seconds (1,
+				(GSourceFunc)blink_idle, data);
+		}
 		
 		if (sim_full && phone_full) {
 			message = "Phone and SIM memory full";
@@ -62,7 +64,10 @@
 		
 		notify_notification_show (data->notification, NULL);
 	} else {
-		g_source_remove (data->blink_idle);
+		if (data->blink_idle) {
+			g_source_remove (data->blink_idle);
+			data->blink_idle = 0;
+		}
 		gtk_widget_hide (GTK_WIDGET (data->applet));
 		notify_notification_close (data->notification, NULL);
 	}