Changeset 2031

Timestamp:

05/19/07 01:48:04 (6 years ago)

Author:

stefan

Message:

2007-05-18 Stefan Schmidt <stefan@…>

• 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.

Location:

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup

Files:

• ChangeLog (modified) (2 diffs)
• src/openmoko-panel-startup.c (modified) (9 diffs)

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog

@@ -1 @@
-2007-05-18  Stefan Schmidt,,,  <stefan@openmoko.org>
+2007-05-18  Stefan Schmidt <stefan@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@openmoko.org>
 
         * src/openmoko-panel-startup.c:
@@ -7 +16 @@
         (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@openmoko.org>

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c

@@ -54 +54 @@
         GdkPixbuf *hglass[HOURGLASS_PIXMAPS];
         const char *last_icon;
-        guint timeout_id;
         GdkWindow *root_window;
         SnDisplay *sn_display;
@@ -64 +63 @@
         char *id;
         time_t when;
+        guint timeout_id;
         LaunchList *next;
 };
@@ -77 +77 @@
         gdk_window_remove_filter (applet->root_window,
                                         (GdkFilterFunc) filter_func, applet);
-        g_source_remove(applet->timeout_id);
         g_slice_free(StartupApplet, applet);
 }
@@ -120 +119 @@
                 {
                         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;
@@ -145 +140 @@
                         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);
@@ -164 +163 @@
                                                 last_item->next = item->next;
 
+                                        g_source_remove(item->timeout_id);
                                         free(item->id);
                                         free(item);
@@ -175 +175 @@
                         if (launch_list == NULL && hourglass_shown)
                                 hide_hourglass(applet);
-
-                        g_source_remove(applet->timeout_id);
                 }
                 break;
@@ -205 +203 @@
                                 last_item->next = item->next;
 
+                        g_source_remove(item->timeout_id);
                         free(item->id);
                         free(item);
@@ -238 +237 @@
         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;