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

[mickey at sita.openmoko.org]

Author: mickey
Date: 2008-01-26 01:02:07 +0100 (Sat, 26 Jan 2008)
New Revision: 3958

Modified:
   trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: clean up some warnings, attempt to fix #1114


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 23:39:28 UTC (rev 3957)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c	2008-01-26 00:02:07 UTC (rev 3958)
@@ -531,12 +531,6 @@
     is_fullscreen = 1 - is_fullscreen;
 }
 
-void neod_buttonactions_popup_selected_orientation( GtkWidget* button, gpointer user_data )
-{
-    gtk_widget_hide( aux_menu );
-	neod_buttonactions_set_orientation(!orientation);
-}
-
 void neod_buttonactions_set_orientation(gboolean new_o) {
     if(new_o)
         g_spawn_command_line_async( "xrandr -o 1", NULL );
@@ -545,6 +539,12 @@
     orientation = new_o;
 }
 
+void neod_buttonactions_popup_selected_orientation( GtkWidget* button, gpointer user_data )
+{
+    gtk_widget_hide( aux_menu );
+    neod_buttonactions_set_orientation(!orientation);
+}
+
 void neod_buttonactions_popup_selected_screenshot( GtkWidget* button, gpointer user_data )
 {
     gtk_widget_hide( aux_menu );
@@ -811,9 +811,9 @@
         gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(power_menu)->vbox), box );
     }
 
-    gtk_button_set_label( gsmpower, g_strdup_printf( "Turn %s GSM", is_turned_on( GSM ) ? "off" : "on" ) );
-    gtk_button_set_label( btpower, g_strdup_printf( "Turn %s Bluetooth", is_turned_on( BLUETOOTH ) ? "off" : "on" ) );
-    gtk_button_set_label( gpspower, g_strdup_printf( "Turn %s GPS", is_turned_on( GPS ) ? "off" : "on" ) );
+    gtk_button_set_label( GTK_BUTTON(gsmpower), g_strdup_printf( "Turn %s GSM", is_turned_on( GSM ) ? "off" : "on" ) );
+    gtk_button_set_label( GTK_BUTTON(btpower), g_strdup_printf( "Turn %s Bluetooth", is_turned_on( BLUETOOTH ) ? "off" : "on" ) );
+    gtk_button_set_label( GTK_BUTTON(gpspower), g_strdup_printf( "Turn %s GPS", is_turned_on( GPS ) ? "off" : "on" ) );
     int response = gtk_dialog_run( GTK_DIALOG(power_menu) );
     g_debug( "gtk_dialog_run completed, response = %d", response );
 }
@@ -1245,6 +1245,7 @@
 		gtk_box_pack_start(GTK_BOX(box1), south, 0, 0, 0);
 
 		gtk_window_fullscreen(GTK_WINDOW(lock_display));
+        gtk_window_set_keep_above( GTK_WINDOW(lock_display), TRUE );
 		gtk_container_add(GTK_CONTAINER(lock_display), box1);
 
 		static GtkTargetEntry targetentries[] = {{"text/plain", 0, 0}};