[maemo-commits] [maemo-commits] r14007 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-21 17:54:22 +0300 (Fri, 21 Sep 2007)
New Revision: 14007

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
Log:
Remove gtk grab from entrycompletion popup

2007-09-21  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup,
	_gtk_entry_completion_popdown): Revert NB#66055 and remove the gtk
	grab again. We want the user to be able use hardkeys and press toolbar
	buttons while the popup is open. The application needs to ensure the
	popup gets closed. NB#69655


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-21 14:36:50 UTC (rev 14006)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-21 14:54:22 UTC (rev 14007)
@@ -1,3 +1,11 @@
+2007-09-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup,
+	_gtk_entry_completion_popdown): Revert NB#66055 and remove the gtk
+	grab again. We want the user to be able use hardkeys and press toolbar
+	buttons while the popup is open. The application needs to ensure the
+	popup gets closed. NB#69655
+
 2007-09-21  Michael Natterer  <mitch at imendio.com>
 
 	Merged from upstream:

Modified: projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-09-21 14:36:50 UTC (rev 14006)
+++ projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-09-21 14:54:22 UTC (rev 14007)
@@ -1589,8 +1589,8 @@
 
   gtk_widget_show (completion->priv->popup_window);
 
+#ifndef MAEMO_CHANGES    
   gtk_grab_add (completion->priv->popup_window);
-#ifndef MAEMO_CHANGES    
   gdk_pointer_grab (completion->priv->popup_window->window, TRUE,
                     GDK_BUTTON_PRESS_MASK |
                     GDK_BUTTON_RELEASE_MASK |
@@ -1609,8 +1609,8 @@
 
 #ifndef MAEMO_CHANGES
   gdk_pointer_ungrab (GDK_CURRENT_TIME);
+  gtk_grab_remove (completion->priv->popup_window);
 #endif
-  gtk_grab_remove (completion->priv->popup_window);
 
   gtk_widget_hide (completion->priv->popup_window);
 }