r3957 - trunk/src/target/OM-2007.2/daemons/neod/src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2008-01-26 00:39:28 +0100 (Sat, 26 Jan 2008)
New Revision: 3957

Modified:
   trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: use the new g_timeout_add_seconds to reduce power consumption


Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2008-01-25 17:16:24 UTC (rev 3956)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2008-01-25 23:39:28 UTC (rev 3957)
@@ -322,7 +322,7 @@
                 if ( event.value == 1 ) /* pressed */
                 {
                     g_debug( "triggering aux timer" );
-                    aux_timer = g_timeout_add( 1 * 1000, (GSourceFunc) neod_buttonactions_aux_timeout, (gpointer)1 );
+                    aux_timer = g_timeout_add_seconds( 1, (GSourceFunc) neod_buttonactions_aux_timeout, (gpointer)1 );
                 }
                 else if ( event.value == 0 ) /* released */
                 {
@@ -341,7 +341,7 @@
                 if ( event.value == 1 ) /* pressed */
                 {
                     g_debug( "triggering power timer" );
-                    power_timer = g_timeout_add( 1 * 1000, (GSourceFunc) neod_buttonactions_power_timeout, (gpointer)1 );
+                    power_timer = g_timeout_add_seconds( 1, (GSourceFunc) neod_buttonactions_power_timeout, (gpointer)1 );
                 }
                 else if ( event.value == 0 ) /* released */
                 {
@@ -964,9 +964,9 @@
         return;
 
     //TODO load this from preferences
-    powersave_timer1 = g_timeout_add( 10 * 1000, (GSourceFunc) neod_buttonactions_powersave_timeout1, (gpointer)1 );
-    powersave_timer2 = g_timeout_add( 30 * 1000, (GSourceFunc) neod_buttonactions_powersave_timeout2, (gpointer)1 );
-    powersave_timer3 = g_timeout_add( 60 * 5 * 1000, (GSourceFunc) neod_buttonactions_powersave_timeout3, (gpointer)1 );
+    powersave_timer1 = g_timeout_add_seconds( 10, (GSourceFunc) neod_buttonactions_powersave_timeout1, (gpointer)1 );
+    powersave_timer2 = g_timeout_add_seconds( 50, (GSourceFunc) neod_buttonactions_powersave_timeout2, (gpointer)1 );
+    powersave_timer3 = g_timeout_add_seconds( 60 * 5, (GSourceFunc) neod_buttonactions_powersave_timeout3, (gpointer)1 );
 }
 
 void neod_buttonactions_set_display( int brightness )