From f49bd56843031ad55eed1c0ae8423e11cbd22b53 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jul 06 2006 16:01:59 +0000
Subject: - Add patch for RH bug #166231 (also addresses #131227 and #157391).


---

diff --git a/evolution-2.7.3-replicated-cjk-input.patch b/evolution-2.7.3-replicated-cjk-input.patch
new file mode 100644
index 0000000..5501bae
--- /dev/null
+++ b/evolution-2.7.3-replicated-cjk-input.patch
@@ -0,0 +1,22 @@
+--- evolution-2.7.3/widgets/text/e-text.c.replicated_cjk_input	2006-07-06 09:57:22.000000000 -0400
++++ evolution-2.7.3/widgets/text/e-text.c	2006-07-06 09:58:27.000000000 -0400
+@@ -1498,7 +1498,8 @@
+ 	}
+ 
+ 
+-	insert_preedit_text (text);	
++	if (text->im_context_signals_registered)
++		insert_preedit_text (text);
+ 
+ 	if (!pango_layout_get_text (text->layout))
+ 		return;
+@@ -2212,7 +2213,8 @@
+ 									      G_SIGNAL_MATCH_DATA,
+                                                                              0, 0, NULL,
+                                                                              NULL, save_text);
+-                                       save_text->im_context_signals_registered = FALSE;
++					save_text->im_context_signals_registered = FALSE;
++					reset_layout (save_text);
+                                 }
+ 
+ 				if (text->im_context) {
diff --git a/evolution.spec b/evolution.spec
index 90dc75c..41f0c1d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -131,6 +131,9 @@ Patch904: evolution-2.7.3-filter-datespec.patch
 # RH bug #175596 / Gnome.org bug #323952
 Patch905: evolution-2.7.3-mailing-list-menu.patch
 
+# RH bug #166231 / Gnome.org bug #264485
+Patch906: evolution-2.7.3-replicated-cjk-input.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -288,6 +291,7 @@ Development files needed for building things which link against evolution.
 %patch903 -p1 -b .candidate-window-position-calendar
 %patch904 -p1 -b .filter-datespec
 %patch905 -p1 -b .mailing-list-menu
+%patch906 -p1 -b .replicated-cjk-input
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -678,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Jul  6 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-8
+- Add patch for RH bug #166231 (also addresses #131227 and #157391).
+
 * Fri Jun 29 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-7
 - Add patch for RH bug #157400, reorder some patch #'s.