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

[From: subversion at stage.maemo.org]

Author: klattimer
Date: 2008-05-20 10:58:35 +0300 (Tue, 20 May 2008)
New Revision: 15578

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
Log:
2008-05-19  Karl Lattimer <karl.lattimer at nokia.com>
        * libhildondesktop/hildon-desktop-popup-window.c: Reversed 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. Causes
        strange menu behavior.
        * configure.ac 2.0.17



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-05-20 07:49:30 UTC (rev 15577)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-05-20 07:58:35 UTC (rev 15578)
@@ -1,3 +1,10 @@
+2008-05-19  Karl Lattimer <karl.lattimer at nokia.com>
+	* libhildondesktop/hildon-desktop-popup-window.c: Reversed 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. Causes
+	strange menu behavior.
+	* configure.ac 2.0.17
+
 2008-05-09  Karl Lattimer <karl.lattimer at nokia.com>
 
 	* src/hd-applications-menu.c: Applied patch provided by adrian bunk regarding
@@ -17,7 +24,7 @@
 2008-04-16  Karl Lattimer <karl.lattimer at nokia.com>
 
 	* libhildondesktop/hildon-desktop-notification-manager.c: reverse
-        2.0.11 patch to fix memory leak, appears to be a double free.
+	2.0.11 patch to fix memory leak, appears to be a double free.
 	* configure.ac: 2.0.14
 
 2008-04-15  Rodrigo Novo  <rodrigo.novo at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2008-05-20 07:49:30 UTC (rev 15577)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-05-20 07:58:35 UTC (rev 15578)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.16)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.17)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2008-05-20 07:49:30 UTC (rev 15577)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2008-05-20 07:58:35 UTC (rev 15578)
@@ -1,3 +1,13 @@
+hildon-desktop (1:2.0.17-1) sardine; urgency=low
+
+  * libhildondesktop/hildon-desktop-popup-window.c: Reversed 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. Causes 
+    strange menu behavior.
+  * configure.ac 2.0.17
+
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Tue, 20 May 2008 10:47:00 +0300
+
 hildon-desktop (1:2.0.16-1) sardine; urgency=low
 
   * src/hd-applications-menu.c: Applied patch provided by adrian bunk regarding

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-20 07:49:30 UTC (rev 15577)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2008-05-20 07:58:35 UTC (rev 15578)
@@ -97,10 +97,6 @@
 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,
@@ -128,7 +124,6 @@
 
   gboolean 			    have_xgrab;
   gboolean			    open;
-  gboolean			    popdown_on_release;
   GtkWidget 			   *pane_with_grab;
 
   GtkWidget			   *attached_widget;
@@ -142,7 +137,6 @@
   popup->priv->extra_panes   = NULL;
   popup->priv->n_extra_panes = 0;
 
-  popup->priv->popdown_on_release =
   popup->priv->open = 
   popup->priv->have_xgrab = FALSE; 
 
@@ -288,11 +282,6 @@
 		    "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 ();
 
@@ -494,9 +483,6 @@
   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
   */
@@ -731,19 +717,6 @@
   
   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,
@@ -1202,8 +1175,6 @@
   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);