summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2007-01-05 14:09:00 +0000
committerMichael Natterer <mitch@src.gnome.org>2007-01-05 14:09:00 +0000
commit01ec5c12f49b300a63752fda6f405d245aebb20f (patch)
treea273504e13ae3cd78ba045b51783dd2ee1120d45
parent454a02e23cc93be5eace240f23b095883647a2f6 (diff)
downloadgdk-pixbuf-01ec5c12f49b300a63752fda6f405d245aebb20f.tar.gz
Merged from HEAD:
2007-01-05 Michael Natterer <mitch@imendio.com> Merged from HEAD: * gtk/gtkwindow.c (gtk_window_key_release_event): chain up to the right function (fix taken from maemo-gtk). svn path=/branches/gtk-2-10/; revision=17079
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkwindow.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91d4cf9ea..1d17b93c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-05 Michael Natterer <mitch@imendio.com>
+
+ Merged from HEAD:
+
+ * gtk/gtkwindow.c (gtk_window_key_release_event): chain up to
+ the right function (fix taken from maemo-gtk).
+
2007-01-05 Behdad Esfahbod <behdad@gnome.org>
* gdk/gdkprivate.h:
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index ac548fa88..e98b89af8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4720,7 +4720,7 @@ gtk_window_key_release_event (GtkWidget *widget,
/* Chain up, invokes binding set */
if (!handled)
- handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_press_event (widget, event);
+ handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_release_event (widget, event);
return handled;
}