[maemo-commits] [maemo-commits] r15540 - in projects/haf/trunk/hildon-desktop: . debian libhildondesktop src

Fri May 9 13:50:31 EEST 2008

Author: klattimer
Date: 2008-05-09 13:50:29 +0300 (Fri, 09 May 2008)
New Revision: 15540

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:
2008-05-09  Karl Lattimer <karl.lattimer at nokia.com>

	* src/hd-applications-menu.c: Applied patch provided by adrian bunk regarding
	bug NB#78264 others menu opening two applications with double tap.
	* libhildondesktop/hildon-desktop-popup-window.c: Applied patch provided by
	adrian bunk regarding bug NB#78610 others menu not closing when cursor is
	initially inside the menu and is released outside of the menu.
	* Repaired errors in debian changelog
	* configure.ac: 2.0.16



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-05-09 09:51:52 UTC (rev 15539)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-05-09 10:50:29 UTC (rev 15540)
@@ -1,3 +1,13 @@
+2008-05-09  Karl Lattimer <karl.lattimer at nokia.com>
+
+	* src/hd-applications-menu.c: Applied patch provided by adrian bunk regarding
+	bug NB#78264 others menu opening two applications with double tap.
+	* libhildondesktop/hildon-desktop-popup-window.c: Applied patch provided by
+	adrian bunk regarding bug NB#78610 others menu not closing when cursor is
+	initially inside the menu and is released outside of the menu.
+	* Repaired errors in debian changelog
+	* configure.ac: 2.0.16
+
 2008-04-16  Karl Lattimer <karl.lattimer at nokia.com>
 
 	* data/restore-menu.sh: Reworked the original update for chinook backup restore

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2008-05-09 09:51:52 UTC (rev 15539)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-05-09 10:50:29 UTC (rev 15540)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.15)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.16)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2008-05-09 09:51:52 UTC (rev 15539)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2008-05-09 10:50:29 UTC (rev 15540)
@@ -1,3 +1,15 @@
+hildon-desktop (1:2.0.16-1) sardine; urgency=low
+
+  * src/hd-applications-menu.c: Applied patch provided by adrian bunk regarding
+    bug NB#78264 others menu opening two applications with double tap.
+  * libhildondesktop/hildon-desktop-popup-window.c: Applied patch provided by
+    adrian bunk regarding bug NB#78610 others menu not closing when cursor is
+    initially inside the menu and is released outside of the menu.
+  * Repaired errors in debian changelog
+  * configure.ac: 2.0.16
+
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Fri, 09 May 2008 10:05:32 +0300 
+
 hildon-desktop (1:2.0.15-1) sardine; urgency=low
 
   * data/restore-menu.sh: Reworked the original update for chinook backup restore
@@ -4,14 +16,14 @@
     to remove a dodgy escaped newline character, which was causing an invalid file
   * configure.ac: 2.0.15
 
-  -- Karl Lattimer <karl.lattimer at nokia.com>  Wed, 16 Apr 2008 17:54:35 +0300 
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Wed, 16 Apr 2008 17:54:35 +0300 
 
 hildon-desktop (1:2.0.14-1) sardine; urgency=low
 
   * libhildondesktop/hildon-desktop-notification-manager.c:  reverse
   2.0.11 patch to fix memory leak, appears to be a double free.
 
-  -- Karl Lattimer <karl.lattimer at nokia.com>  Wed, 16 Apr 2008 09:11:38 +0300 
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Wed, 16 Apr 2008 09:11:38 +0300 
 
 hildon-desktop (1:2.0.13-1) sardine; urgency=low
 
@@ -46,7 +58,7 @@
   Fixes: NB#82941 "SSU: Restoring backup that does not have software
   update notifier disables the plugin"
 
-  -- Rodrigo Novo <rodrigo.novo at nokia.com> Tue,  8 Apr 2008 15:39:00 +0300
+ -- Rodrigo Novo <rodrigo.novo at nokia.com> Tue,  8 Apr 2008 15:39:00 +0300
 
 hildon-desktop (1:2.0.10-1) sardine; urgency=low
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2008-05-09 09:51:52 UTC (rev 15539)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2008-05-09 10:50:29 UTC (rev 15540)
@@ -97,6 +97,10 @@
 static gboolean hildon_desktop_popup_window_delete_event (GtkWidget *widget,
 							  GdkEvent  *event,
 							  gpointer   data);
+
+static gboolean hildon_desktop_popup_window_release_event (GtkWidget *widget,
+							   GdkEvent  *event,
+							   gpointer   data);
 #endif
 static gboolean hildon_desktop_popup_window_composited_leave_notify (GtkWidget *widget,
 						     		     GdkEventCrossing *event,
@@ -124,6 +128,7 @@
 
   gboolean 			    have_xgrab;
   gboolean			    open;
+  gboolean			    popdown_on_release;
   GtkWidget 			   *pane_with_grab;
 
   GtkWidget			   *attached_widget;
@@ -137,6 +142,7 @@
   popup->priv->extra_panes   = NULL;
   popup->priv->n_extra_panes = 0;
 
+  popup->priv->popdown_on_release =
   popup->priv->open = 
   popup->priv->have_xgrab = FALSE; 
 
@@ -282,6 +288,11 @@
 		    "delete-event",
 		    G_CALLBACK (hildon_desktop_popup_window_delete_event),
 		    NULL);
+
+  g_signal_connect (popup,
+		    "button-release-event",
+		    G_CALLBACK (hildon_desktop_popup_window_release_event),
+		    NULL);
 #endif
   gtk_widget_push_composite_child ();
 
@@ -483,6 +494,9 @@
   gint w,h,x,y,i;
   gboolean in_panes_area = FALSE;
  
+  if (!event->mode)
+    popup->priv->popdown_on_release = TRUE;
+
   /* We have to ungrab the pointer in here, we should get this when we go to
   * a composited window
   */
@@ -717,6 +731,19 @@
   
   return TRUE;
 }
+
+static gboolean 
+hildon_desktop_popup_window_release_event (GtkWidget *widget,
+					   GdkEvent *event,
+					   gpointer data)
+{ 
+  HildonDesktopPopupWindow *popup = HILDON_DESKTOP_POPUP_WINDOW (widget);
+
+  if (popup->priv->popdown_on_release)
+    hildon_desktop_popup_window_popdown (popup);
+
+  return TRUE;
+}
 #endif
 static gboolean
 hildon_desktop_popup_window_composited_button_press (GtkWidget *widget,
@@ -1175,6 +1202,8 @@
   if (popup_grab_on_window (transfer_window, activate_time, TRUE))
     popup->priv->have_xgrab = TRUE;
 
+  popup->priv->popdown_on_release = FALSE;
+
   if (popup->priv->attached_widget)
   {
     parent_toplevel = gtk_widget_get_toplevel (popup->priv->attached_widget);

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2008-05-09 09:51:52 UTC (rev 15539)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2008-05-09 10:50:29 UTC (rev 15540)
@@ -268,14 +268,6 @@
 			        FALSE);
 }
 
-static void
-hd_applications_menu_unmap (GtkWidget *menu, HDApplicationsMenu *button)
-{
-  g_return_if_fail (button);
-
-  hd_applications_menu_initial_setup (button);
-}
-
 static gboolean
 hd_applications_menu_key_press (GtkWidget *menu,
 			        GdkEventKey *event,
@@ -1050,11 +1042,6 @@
 		    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);
@@ -1229,8 +1216,9 @@
   if (!button->priv->popup_window)
   {
     hd_applications_menu_create_menu (button);
-    hd_applications_menu_initial_setup (button);
   }
+
+  hd_applications_menu_initial_setup (button);
     
   hildon_desktop_popup_window_popup (button->priv->popup_window,
 		                     (HDPopupWindowPositionFunc) hd_applications_menu_get_menu_position,


