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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-05-29 13:59:23 +0300 (Tue, 29 May 2007)
New Revision: 11946

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkwindow.c
Log:
2007-05-29  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkwindow.c (gtk_window_key_press_event): fix another small
	mis-merge from the GTK+ 2.10.12 upgrade.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-29 10:58:13 UTC (rev 11945)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-29 10:59:23 UTC (rev 11946)
@@ -1,3 +1,8 @@
+2007-05-29  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkwindow.c (gtk_window_key_press_event): fix another small
+	mis-merge from the GTK+ 2.10.12 upgrade.
+
 2007-05-29  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkmenushell.c (_gtk_menu_shell_fake_button_events): do not
@@ -46,6 +51,8 @@
 	keeps the menu open on its opening click unless an item was
 	activated.
 
+	(patch filed upstream, therefore no #ifdef MAEMO_CHANGES)
+
 2007-05-25  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): really fix

Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwindow.c	2007-05-29 10:58:13 UTC (rev 11945)
+++ projects/haf/trunk/gtk+/gtk/gtkwindow.c	2007-05-29 10:59:23 UTC (rev 11946)
@@ -4701,7 +4701,7 @@
 
   /* Chain up, invokes binding set */
   if (!handled)
-    handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_release_event (widget, event);
+    handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_press_event (widget, event);
 
   return handled;
 }