[maemo-commits] [maemo-commits] r11000 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-04-11 17:21:19 +0300 (Wed, 11 Apr 2007)
New Revision: 11000

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hn-others-button.c
Log:

	* src/hn-others-button.c: Set active others menu's toggle button when
        opened by using right key. Fixes: NB#54020.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-11 13:49:09 UTC (rev 10999)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-11 14:21:19 UTC (rev 11000)
@@ -1,3 +1,8 @@
+2007-04-11  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hn-others-button.c: Set active others menu's toggle button when
+	opened by using right key. Fixes: NB#54020.
+
 2007-04-10  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-home-area.c:

Modified: projects/haf/trunk/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-04-11 13:49:09 UTC (rev 10999)
+++ projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-04-11 14:21:19 UTC (rev 11000)
@@ -877,12 +877,20 @@
       event->keyval == GDK_KP_Enter)
   {
     hn_others_button_menu_show (button);
+ 
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button->priv->button), TRUE); 
+
     return TRUE;
   }
   else if (event->keyval == GDK_Left || 
            event->keyval == GDK_KP_Left)
   {
-    hd_wm_activate (HD_TN_ACTIVATE_LAST_APP_WINDOW);
+    gtk_widget_grab_focus (widget);
+	  
+    GdkWindow *w = 
+      gtk_widget_get_parent_window (GTK_WIDGET (button));
+	  
+    hd_wm_activate_window (HD_TN_ACTIVATE_KEY_FOCUS, w);
   }
 	
   return FALSE;
@@ -935,7 +943,7 @@
   
   button->priv->collapse_id = 0;
   button->priv->thumb_pressed = FALSE;
-  
+
   return FALSE;
 }