From: Fumihito YOSHIDA <hito@ubuntu.com>
Subject: Fix crash in preedit_changed handler, where nautilus crashes on
 most IM context changes due to the missing GtkIMContext in the signal handler
Last-Update: 2010-09-22

Index: nautilus/libnautilus-private/nautilus-icon-container.c
===================================================================
--- nautilus.orig/libnautilus-private/nautilus-icon-container.c	2010-09-22 09:12:48.529747993 -0400
+++ nautilus/libnautilus-private/nautilus-icon-container.c	2010-09-22 09:14:37.359747997 -0400
@@ -4916,7 +4916,7 @@
  * callback.
  */
 static void
-nautilus_icon_container_search_preedit_changed (GtkEntry *entry,
+nautilus_icon_container_search_preedit_changed (GtkIMContext *im_context,
 						NautilusIconContainer *container)
 {
 	container->details->imcontext_changed = 1;
@@ -5274,7 +5274,7 @@
 	g_signal_connect (container->details->search_entry, "activate",
 			  G_CALLBACK (nautilus_icon_container_search_activate),
 			  container);
-	g_signal_connect (container->details->search_entry,
+	g_signal_connect (GTK_ENTRY (container->details->search_entry)->im_context,
 			  "preedit-changed",
 			  G_CALLBACK (nautilus_icon_container_search_preedit_changed),
 			  container);
