Changeset 3412

Timestamp:

11/14/07 10:18:09 (6 years ago)

Author:

mickey

Message:

neod: aux and power button presses close their respective menus, if open

File:

• trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c (modified) (4 diffs)

trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c

@@ -422 +422 @@
     neod_buttonactions_powersave_reset();
     neod_buttonactions_set_display( 100 );
+
+    if ( aux_menu && GTK_WIDGET_MAPPED(aux_menu) )
+    {
+        g_debug( "aux menu already open -- closing." );
+        gtk_widget_hide( aux_menu );
+        return FALSE;
+    }
 
     aux_timer = -1;
@@ -534 +541 @@
 void neod_buttonactions_popup_selected_lock( GtkWidget* button, gpointer user_data )
 {
+    gtk_widget_hide( power_menu );
     int fd = open( "/sys/power/state", O_WRONLY );
     if ( fd != -1 )
@@ -771 +779 @@
         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" ) );
@@ -848 +857 @@
     neod_buttonactions_set_display( 100 );
 
+    if ( power_menu && GTK_WIDGET_MAPPED(power_menu) )
+    {
+        g_debug( "power menu already open -- closing." );
+        gtk_widget_hide( power_menu );
+        return;
+    }
+
     power_timer = -1;