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

[stefan at sita.openmoko.org]

Author: stefan
Date: 2007-05-19 02:36:06 +0200 (Sat, 19 May 2007)
New Revision: 2032

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-19  Stefan Schmidt <stefan at openmoko.org>

        * src/openmoko-panel-startup.c:
        (show_hourglass):
        (hide_hourglass):
        (monitor_event_func):
        (applet_main):
        (filter_func):
		Define a debug macro and disbale debug by default.



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 23:48:04 UTC (rev 2031)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog	2007-05-19 00:36:06 UTC (rev 2032)
@@ -1,3 +1,13 @@
+2007-05-19  Stefan Schmidt <stefan at openmoko.org>
+
+        * src/openmoko-panel-startup.c:
+        (show_hourglass):
+        (hide_hourglass):
+        (monitor_event_func):
+        (applet_main):
+        (filter_func):
+		Define a debug macro and disbale debug by default.
+
 2007-05-18  Stefan Schmidt <stefan at openmoko.org>
 
         * ChangeLog:

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 23:48:04 UTC (rev 2031)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c	2007-05-19 00:36:06 UTC (rev 2032)
@@ -46,6 +46,14 @@
 
 #include <string.h>
 
+#undef DEBUG_THIS_FILE
+
+#ifdef DEBUG_THIS_FILE
+#define DEBUG(_format_, ...) g_debug(_format_, ## __VA_ARGS__)
+#else
+#define DEBUG(...)
+#endif
+
 #define TIMEOUT		   20
 #define HOURGLASS_PIXMAPS 8
 
@@ -89,14 +97,14 @@
 
 static void show_hourglass(StartupApplet *applet)
 {
-	g_message("Entered %s", G_STRFUNC);
+	DEBUG("Entered %s", G_STRFUNC);
 	gtk_widget_show_all(GTK_WIDGET (applet->image));
 	hourglass_shown = TRUE;
 }
 
 static void hide_hourglass(StartupApplet *applet)
 {
-	g_message("Entered %s", G_STRFUNC);
+	DEBUG("Entered %s", G_STRFUNC);
 	gtk_widget_hide_all(GTK_WIDGET (applet->image));
 	hourglass_shown = FALSE;
 }
@@ -109,7 +117,7 @@
 	time_t t;
 	StartupApplet *applet = (StartupApplet *) user_data;
 
-	g_message("Entered %s", G_STRFUNC);
+	DEBUG("Entered %s", G_STRFUNC);
 	context = sn_monitor_event_get_context(event);
 	sequence = sn_monitor_event_get_startup_sequence(event);
 	id = sn_startup_sequence_get_id(sequence);
@@ -117,7 +125,7 @@
 	switch (sn_monitor_event_get_type(event)) {
 	case SN_MONITOR_EVENT_INITIATED:
 		{
-			g_message("Entered SN_MONITOR_EVENT_INITIATED");
+			DEBUG("Entered SN_MONITOR_EVENT_INITIATED");
 
 			LaunchList *item = launch_list;
 
@@ -151,7 +159,7 @@
 	case SN_MONITOR_EVENT_COMPLETED:
 	case SN_MONITOR_EVENT_CANCELED:
 		{
-			g_message("Entered SN_MONITOR_EVENT_CANCELED/COMPLETED");
+			DEBUG("Entered SN_MONITOR_EVENT_CANCELED/COMPLETED");
 			LaunchList *item = launch_list, *last_item = NULL;
 
 			/* Find actual list item and free it*/
@@ -187,7 +195,7 @@
 	LaunchList *last_item = NULL;
 	time_t t;
 
-	g_message("Entered %s", G_STRFUNC);
+	DEBUG("Entered %s", G_STRFUNC);
 
 	if (!hourglass_shown)
 		return TRUE;
@@ -222,7 +230,7 @@
 	if (hourglass_cur_frame_n == 8)
 		hourglass_cur_frame_n = 0;
 
-	g_message("hourglass_cur_frame_n =%i", hourglass_cur_frame_n);
+	DEBUG("hourglass_cur_frame_n =%i", hourglass_cur_frame_n);
 
     gtk_image_set_from_pixbuf( applet->image, applet->hglass[hourglass_cur_frame_n] );
 
@@ -236,8 +244,6 @@
 
 	ret = sn_display_process_event(applet->sn_display, xevent);
 
-	//g_message("%s: sn_display_process return value: %i", G_STRFUNC, ret);
-
 	return GDK_FILTER_CONTINUE;
 }