r2031 - in trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup: . src

[stefan at sita.openmoko.org]

Author: stefan
Date: 2007-05-19 01:48:04 +0200 (Sat, 19 May 2007)
New Revision: 2031

Modified:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
Log:
2007-05-18  Stefan Schmidt <stefan at openmoko.org>

        * ChangeLog:
        * src/openmoko-panel-startup.c:
        (startup_applet_free):
        (monitor_event_func):
        (applet_main):
        (filter_func):
		Make it less noisy by disableing debug for sn_process return value.
		Correct the timer add and remove handling.



Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog	2007-05-18 22:45:01 UTC (rev 2030)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog	2007-05-18 23:48:04 UTC (rev 2031)
@@ -1,11 +1,22 @@
-2007-05-18  Stefan Schmidt,,,  <stefan at openmoko.org>
+2007-05-18  Stefan Schmidt <stefan at openmoko.org>
 
-        Reviewed by NOBODY (OOPS!).
+        * ChangeLog:
+        * src/openmoko-panel-startup.c:
+        (startup_applet_free):
+        (monitor_event_func):
+        (applet_main):
+        (filter_func):
+		Make it less noisy by disableing debug for sn_process return value.
+		Correct the timer add and remove handling.
 
+2007-05-18  Stefan Schmidt <stefan at openmoko.org>
+
         * src/openmoko-panel-startup.c:
         (show_hourglass):
         (hide_hourglass):
         (mb_panel_applet_create):
+		A special eventbox around the image is not needed.
+		Cleanup some unneeded code
 
 2007-05-18 Stefan Schmidt <stefan at openmoko.org>
 

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c	2007-05-18 22:45:01 UTC (rev 2030)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c	2007-05-18 23:48:04 UTC (rev 2031)
@@ -53,7 +53,6 @@
 	GtkImage *image;
 	GdkPixbuf *hglass[HOURGLASS_PIXMAPS];
 	const char *last_icon;
-	guint timeout_id;
 	GdkWindow *root_window;
 	SnDisplay *sn_display;
 } StartupApplet;
@@ -63,6 +62,7 @@
 struct LaunchList {
 	char *id;
 	time_t when;
+	guint timeout_id;
 	LaunchList *next;
 };
 
@@ -76,7 +76,6 @@
 {
 	gdk_window_remove_filter (applet->root_window,
 					(GdkFilterFunc) filter_func, applet);
-	g_source_remove(applet->timeout_id);
 	g_slice_free(StartupApplet, applet);
 }
 
@@ -120,10 +119,6 @@
 		{
 			g_message("Entered SN_MONITOR_EVENT_INITIATED");
 
-			/* Set up a timeout that will be called every 0.5 seconds */
-			applet->timeout_id = g_timeout_add(500,
-					   (GSourceFunc) applet_main, applet);
-
 			LaunchList *item = launch_list;
 
 			/* Reset counter */
@@ -144,6 +139,10 @@
 			t = time(NULL);
 			item->when = t + TIMEOUT;
 
+			/* Set up a timeout that will be called every 0.5 seconds */
+			item->timeout_id = g_timeout_add(500,
+					   (GSourceFunc) applet_main, applet);
+
 			if (!hourglass_shown)
 				show_hourglass(applet);
 		}
@@ -163,6 +162,7 @@
 					else
 						last_item->next = item->next;
 
+					g_source_remove(item->timeout_id);
 					free(item->id);
 					free(item);
 
@@ -174,8 +174,6 @@
 
 			if (launch_list == NULL && hourglass_shown)
 				hide_hourglass(applet);
-
-			g_source_remove(applet->timeout_id);
 		}
 		break;
 	default:
@@ -204,6 +202,7 @@
 			else
 				last_item->next = item->next;
 
+			g_source_remove(item->timeout_id);
 			free(item->id);
 			free(item);
 
@@ -237,7 +236,7 @@
 
 	ret = sn_display_process_event(applet->sn_display, xevent);
 
-	g_message("%s: sn_display_process return value: %i", G_STRFUNC, ret);
+	//g_message("%s: sn_display_process return value: %i", G_STRFUNC, ret);
 
 	return GDK_FILTER_CONTINUE;
 }