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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-08-31 17:35:32 +0300 (Fri, 31 Aug 2007)
New Revision: 13536

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/debian/changelog
   projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
Log:
Add again the gtk grab for GtkEntryCompletion popup.

Also update the debian changelog.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-08-31 14:03:40 UTC (rev 13535)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-08-31 14:35:32 UTC (rev 13536)
@@ -1,3 +1,11 @@
+2007-08-31  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popdown): add the
+	gtk grab for the popup window. This way the popup at least will close
+	when the user clicks outside it but in the same app/process.
+
+	Fixes: NB#66055
+
 2007-08-31  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenuitem.c: add an arrow-scaling style property which allows

Modified: projects/haf/trunk/gtk+/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog	2007-08-31 14:03:40 UTC (rev 13535)
+++ projects/haf/trunk/gtk+/debian/changelog	2007-08-31 14:35:32 UTC (rev 13536)
@@ -1,3 +1,17 @@
+gtk+2.0 (2:2.10.12-0osso14) unstable; urgency=low
+
+  * Add maemo-min-size and maemo-aspect-ratio style properties for
+    GtkArrow for fine grained control of their size. Fixes: NB#66402
+  * Add "submenu" property. Fix gtk_menu_item_set_submenu() to accept
+    NULL submenus and deprecate gtk_menu_item_remove_submenu() because
+    we have a properly working setter now. Fixes: MB#1701, NB#66518
+  * Clamp GtkEntryCompletion popup to the available space. Fixes: NB#55607
+  * Add arrow-scale property for GtkMenuItem.
+  * Add again the gtk grab to the popup window in entrycompletion.
+    Fixes: NB#66055
+
+ -- Xan Lopez <xan.lopez at nokia.com>  Fri, 31 Aug 2007 14:59:47 +0300
+
 gtk+2.0 (2:2.10.12-0osso13) unstable; urgency=low
 
   * debian/rules: update shlibs to >= 2:2.10.12-osso13
@@ -45,7 +59,6 @@
 
  -- Xan Lopez <xan.lopez at nokia.com>  Thu,  2 Aug 2007 18:59:08 +0300
 
-
 gtk+2.0 (2:2.10.12-0osso8) unstable; urgency=low
 
   * Use gtk-dnd-drag-threshold (which is 30) instead of a hardcoded

Modified: projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-08-31 14:03:40 UTC (rev 13535)
+++ projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-08-31 14:35:32 UTC (rev 13536)
@@ -1575,8 +1575,8 @@
 
   gtk_widget_show (completion->priv->popup_window);
 
+  gtk_grab_add (completion->priv->popup_window);
 #ifndef 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 |
@@ -1594,9 +1594,9 @@
   completion->priv->ignore_enter = FALSE;
 
 #ifndef MAEMO_CHANGES
-  gdk_pointer_ungrab (GDK_CURRENT_TIME);  
+  gdk_pointer_ungrab (GDK_CURRENT_TIME);
+#endif
   gtk_grab_remove (completion->priv->popup_window);
-#endif
 
   gtk_widget_hide (completion->priv->popup_window);
 }