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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-10-29 12:56:29 +0200 (Mon, 29 Oct 2007)
New Revision: 14663

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:
2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-applications-menu.c (hd_applications_menu_unmap,
	hd_applications_menu_init): make the initial setup (select first
	category) on window unmap instead of window popdown in order to avoid
	errouneous applications activation when doing double clicks.
	Fixes: NB#73137.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 10:37:38 UTC (rev 14662)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 10:56:29 UTC (rev 14663)
@@ -1,3 +1,11 @@
+2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-applications-menu.c (hd_applications_menu_unmap,
+	hd_applications_menu_init): make the initial setup (select first
+	category) on window unmap instead of window popdown in order to avoid
+	errouneous applications activation when doing double clicks.
+	Fixes: NB#73137.
+
 2007-10-29  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-desktop-panel-window-composite.c

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-10-29 10:37:38 UTC (rev 14662)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-10-29 10:56:29 UTC (rev 14663)
@@ -173,7 +173,7 @@
   priv->home_dir_monitor = NULL;
   priv->desktop_dir_monitor = NULL;
 
-  priv->focus_applications = FALSE;
+  priv->focus_applications = TRUE;
   priv->motion_reset = FALSE;
   
   priv->button = hildon_desktop_toggle_button_new ();
@@ -263,7 +263,13 @@
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button->priv->button),
 			        FALSE);
+}
 
+static void
+hd_applications_menu_unmap (GtkWidget *menu, HDApplicationsMenu *button)
+{
+  g_return_if_fail (button);
+
   hd_applications_menu_initial_setup (button);
 }
 
@@ -442,7 +448,7 @@
     gtk_widget_grab_focus (GTK_WIDGET (item));
   }
 
-  button->priv->focus_applications = FALSE;
+  button->priv->focus_applications = TRUE;
 }
 
 static void
@@ -888,7 +894,7 @@
 
     button->priv->motion_reset = FALSE;
   }
-  
+
   return TRUE;
 }
 
@@ -1041,6 +1047,11 @@
 		    G_CALLBACK (hd_applications_menu_popdown),
 		    button);
   
+  g_signal_connect (G_OBJECT (popup_window), 
+		    "unmap",
+		    G_CALLBACK (hd_applications_menu_unmap),
+		    button);
+  
   gtk_widget_show (box);
 
   gtk_container_add (GTK_CONTAINER (alignment), box);