summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2008-09-01 15:31:25 +0000
committerChristian Neumair <cneumair@src.gnome.org>2008-09-01 15:31:25 +0000
commit6f962d159f326467a55e8fee83b4678904eec3ce (patch)
tree33a145fb2d86551992c22e40267525337b3bed14
parent6b5fd5475a484a2759daca37c1e2b7e68e7bf5c9 (diff)
downloadnautilus-6f962d159f326467a55e8fee83b4678904eec3ce.tar.gz
Reset event window before freeing event.
2008-09-01 Christian Neumair <cneumair@gnome.org> * libnautilus-private/nautilus-icon-container.c (key_press_event): Reset event window before freeing event. svn path=/trunk/; revision=14561
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-icon-container.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be0eaa891..1d904d7fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01 Christian Neumair <cneumair@gnome.org>
+
+ * libnautilus-private/nautilus-icon-container.c (key_press_event):
+ Reset event window before freeing event.
+
2008-09-01 Bastien Nocera <hadess@hadess.net>
* src/file-manager/nautilus-audio-mime-types.h: Update with
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 493ad9ae3..909afe709 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -5335,6 +5335,7 @@ key_press_event (GtkWidget *widget,
event->keyval != GDK_BackSpace &&
event->keyval != GDK_Delete) {
GdkEvent *new_event;
+ GdkWindow *window;
char *old_text;
const char *new_text;
gboolean retval;
@@ -5347,6 +5348,7 @@ key_press_event (GtkWidget *widget,
/* Make a copy of the current text */
old_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (container->details->search_entry)));
new_event = gdk_event_copy ((GdkEvent *) event);
+ window = ((GdkEventKey *) new_event)->window;
((GdkEventKey *) new_event)->window = container->details->search_entry->window;
gtk_widget_realize (container->details->search_window);
@@ -5385,6 +5387,7 @@ key_press_event (GtkWidget *widget,
}
}
+ ((GdkEventKey *) new_event)->window = window;
gdk_event_free (new_event);
}