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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-07-03 12:07:20 +0300 (Tue, 03 Jul 2007)
New Revision: 12616

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
Log:
2007-07-02  Xan Lopez  <xan.lopez at nokia.com>

	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup),
	(_gtk_entry_completion_popdown): 
	Do not grab keyboard and pointer for the popup window.
	Fixes: NB#60874


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-07-03 09:05:27 UTC (rev 12615)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-07-03 09:07:20 UTC (rev 12616)
@@ -1,3 +1,10 @@
+2007-07-02  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup),
+	(_gtk_entry_completion_popdown): 
+	Do not grab keyboard and pointer for the popup window.
+	Fixes: NB#60874
+
 2007-07-03  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkradiobutton.c (gtk_radio_button_focus):
@@ -3,7 +10,7 @@
 	
 	We have remapped cursor keys to TAB movements in our rc files, so we get
-        TAB_{FORWARD,BACKWARD} instead of DOWN/UP in the focus handler of GtkRadioButton.
-	We need to re-enable the old behavior or navigation within the group would be
-        impossible.
+	TAB_{FORWARD,BACKWARD} instead of DOWN/UP in the focus handler of GtkRadioButton.
+	We need to re-enable the old behavior or navigation within the group would 
+	impossible. Fixes: NB#62251
 
 2007-06-29  Michael Natterer  <mitch at imendio.com>

Modified: projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-07-03 09:05:27 UTC (rev 12615)
+++ projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-07-03 09:07:20 UTC (rev 12616)
@@ -1454,13 +1454,15 @@
   
 
   gtk_widget_show (completion->priv->popup_window);
-    
+
+#if !MAEMO_CHANGES    
   gtk_grab_add (completion->priv->popup_window);
   gdk_pointer_grab (completion->priv->popup_window->window, TRUE,
                     GDK_BUTTON_PRESS_MASK |
                     GDK_BUTTON_RELEASE_MASK |
                     GDK_POINTER_MOTION_MASK,
                     NULL, NULL, GDK_CURRENT_TIME);
+#endif
 }
 
 void
@@ -1470,9 +1472,11 @@
     return;
 
   completion->priv->ignore_enter = FALSE;
-  
-  gdk_pointer_ungrab (GDK_CURRENT_TIME);
+
+#if !MAEMO_CHANGES
+  gdk_pointer_ungrab (GDK_CURRENT_TIME);  
   gtk_grab_remove (completion->priv->popup_window);
+#endif
 
   gtk_widget_hide (completion->priv->popup_window);
 }