r1768 - trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-04-15 18:43:35 +0200 (Sun, 15 Apr 2007)
New Revision: 1768

Modified:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h
Log:
openmoko-panel-mainmenu: don't use apm -s while it's broken, use echo /sys/power/state in the meantime


Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c	2007-04-15 15:45:18 UTC (rev 1767)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c	2007-04-15 16:43:35 UTC (rev 1768)
@@ -175,8 +175,6 @@
 // this is hardcoded to the Neo1973
 void panel_mainmenu_popup_positioning_cb( GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer user_data )
 {
-    g_debug( "aux_menu = %p, power_menu = %p", aux_menu, power_menu );
-    g_debug( "menu = %p", menu );
     GtkRequisition req;
     gtk_widget_size_request( GTK_WIDGET(menu), &req );
     gint screen_width = gdk_screen_width();
@@ -198,11 +196,20 @@
 
 void panel_mainmenu_popup_selected_lock( GtkMenuItem* menu, gpointer user_data )
 {
-    system( "apm -s");
+    //FIXME talk to neod
+    int fd = open( "/sys/power/state", O_WRONLY );
+    if ( fd != -1 )
+    {
+        char command[] = "mem\n";
+        write(fd, &command, sizeof(command) );
+        close( fd );
+    }
 }
 
 void panel_mainmenu_popup_selected_poweroff( GtkMenuItem* menu, gpointer user_data )
 {
+    //FIXME talk to neod
+    //FIXME notify user
     system( "/bin/sh poweroff");
 }
 

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h	2007-04-15 15:45:18 UTC (rev 1767)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h	2007-04-15 16:43:35 UTC (rev 1768)
@@ -20,7 +20,7 @@
 #define VFOLDERDIR 		"/usr/share/matchbox"
 #define DD_DIR 		 	"/usr/share/applications/"
 
-#define PIXMAP_PATH 	"/usr/local/share/pixmaps"
+#define PIXMAP_PATH 	"/usr/share/pixmaps"
 
 #ifdef DEBUG
 #define DBG(txt, args... ) fprintf(stderr, "DT-DEBUG: " txt , ##args )