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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-21 10:36:55 +0300 (Fri, 21 Sep 2007)
New Revision: 13963

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

2007-09-21 Johan Bilien  <johan.bilien at nokia.com>

	* src/hn-app-button.c:
	- set the previous button even if it happens to be the same as
	the new one
	- when the group menu is closed, if no previous active button,
	unset current button.
	Fixes: NB#70354



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-21 07:20:38 UTC (rev 13962)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-21 07:36:55 UTC (rev 13963)
@@ -1,3 +1,12 @@
+2007-09-21 Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hn-app-button.c:
+	- set the previous button even if it happens to be the same as
+	the new one
+	- when the group menu is closed, if no previous active button,
+	unset current button.
+	Fixes: NB#70354
+
 2007-09-20  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-applications-menu.c (hd_applications_menu_activate_category):

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-button.c	2007-09-21 07:20:38 UTC (rev 13962)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-button.c	2007-09-21 07:36:55 UTC (rev 13963)
@@ -305,12 +305,12 @@
 	    }
         }
 
+      toggle_button->active = !toggle_button->active;
       if (!found && app_button->priv->info != NULL)
 	new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE);
       else
         {
           toggled = TRUE;
-	  toggle_button->active = !toggle_button->active;
           new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
 	}
     }
@@ -493,7 +493,15 @@
       /*gtk_toggle_button_set_active (app_button->priv->prev_button, TRUE);*/
       gtk_toggle_button_toggled (app_button->priv->prev_button);
     }
-  
+  else if (!app_button->priv->prev_button)
+    {
+      /* Untoggle myself */
+      gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (app_button), TRUE);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (app_button), FALSE);
+      gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (app_button));
+
+    }
+
 }
 
 static gboolean
@@ -891,7 +899,7 @@
     {
       tmp_button = l->data;
 
-      if (tmp_button->active && (tmp_button != toggle_button))
+      if (tmp_button->active)
         {
           priv->prev_button = tmp_button;
           break;