Merge lp:~cyphermox/nautilus/lp625696 into lp:~ubuntu-desktop/nautilus/ubuntu

[Mathieu Trudel-Lapierre]

[Didier Roche-Tolomelli (didrocks)]

That fixes the crash and I don't notice any side effects! Thanks :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-13 21:35:33 +0000
+++ debian/changelog	2010-09-22 13:59:43 +0000
@@ -1,3 +1,12 @@
+nautilus (1:2.31.92-0ubuntu2) UNRELEASED; urgency=low
+
+  * Patch typeahead search in icon/compact view to properly deal with input
+    method changes (LP: #625696)
+    - added debian/patches/18_preedit_use_imcontext.patch
+    - updated debian/patches/series
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 22 Sep 2010 09:17:53 -0400
+
 nautilus (1:2.31.92-0ubuntu1) maverick; urgency=low
 
   * New upstream version:
 
=== added file 'debian/patches/18_preedit_use_imcontext.patch'
--- debian/patches/18_preedit_use_imcontext.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/18_preedit_use_imcontext.patch	2010-09-22 13:59:43 +0000
@@ -0,0 +1,27 @@
+From: Fumihito YOSHIDA <[e-mail]>
+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);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-13 21:35:33 +0000
+++ debian/patches/series	2010-09-22 13:59:43 +0000
@@ -5,6 +5,7 @@
 12_list-view_expand.patch
 15_translations_list_update.patch
 16_desktop_menu_export.patch
+18_preedit_use_imcontext.patch
 80_suppress_umount_in_ltsp.patch
 82_gnome-app-install.patch
 83_never_exec_nonexec_launchers.patch