[maemo-commits] [maemo-commits] r8442 - in projects/haf/trunk/maemo-af-desktop: . hildon-navigator

[From: www-data at stage.maemo.org]

Author: jobi
Date: 2006-11-29 12:28:19 +0200 (Wed, 29 Nov 2006)
New Revision: 8442

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

2006-11-29  Johan Bilien <johan.bilien at nokia.com>

	* hildon-navigator/hn-app-button.c: Removed thumbed menu.
	Fixes: NB#48665



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-29 09:08:57 UTC (rev 8441)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-29 10:28:19 UTC (rev 8442)
@@ -1,5 +1,10 @@
 2006-11-29  Johan Bilien <johan.bilien at nokia.com>
 
+	* hildon-navigator/hn-app-button.c: Removed thumbed menu.
+	Fixes: NB#48665
+
+2006-11-29  Johan Bilien <johan.bilien at nokia.com>
+
 	* hildon-home/background-manager.c: Check if the operation
 	was cancelled during loading and compositing. Fixes: NB#42484
 

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c	2006-11-29 09:08:57 UTC (rev 8441)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c	2006-11-29 10:28:19 UTC (rev 8442)
@@ -144,7 +144,6 @@
   GtkWidget *menu;
 
   guint is_blinking  : 1;
-  guint is_thumbable : 1;
 };
 
 
@@ -425,7 +424,7 @@
       GtkWidget *menu_item;
 
       menu_item =
-        hn_app_menu_item_new(l->data, FALSE, app_button->priv->is_thumbable);
+        hn_app_menu_item_new(l->data, FALSE, FALSE);
 
       /* the G spec says the first item should be selected */
       if (!active_item)
@@ -787,11 +786,6 @@
   hn_app_button_pop_menu (app_button);
 
  out:
-  /* reset the thumbable flag, to avoid problems if the menu is raised
-   * some other way than via pointer (should really only be an issue for
-   * the main menu button, but does us no harm to do it here too)
-   */
-  priv->is_thumbable = FALSE;
 
 #if 0
   /*
@@ -829,11 +823,6 @@
   HN_DBG("App button pressed using button %d", event->button);
 
   hn_wm_activate(HN_TN_DEACTIVATE_KEY_FOCUS);
-
-  if (event->button == APP_BUTTON_THUMBABLE)
-    priv->is_thumbable = TRUE;
-  else
-    priv->is_thumbable = FALSE;
   
   HN_DBG ("choosing");
 
@@ -989,7 +978,6 @@
   priv->info = NULL;
   
   priv->is_blinking = FALSE;
-  priv->is_thumbable = FALSE;
 
   gtk_widget_set_size_request (GTK_WIDGET (app_button), -1, BUTTON_HEIGHT);
   gtk_widget_set_sensitive (GTK_WIDGET (app_button), FALSE);