Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-12-22 12:54:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2014-12-03
22:48:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-12-22
12:52:54.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 18 15:23:06 UTC 2014 - ft...@geeko.jp
+
+- Add boo906143-revert-session.patch
+ * Fix pre-edit is not reset after focus lost (boo#906143)
+
+-------------------------------------------------------------------
New:
----
boo906143-revert-session.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozc.spec ++++++
--- /var/tmp/diff_new_pack.SCJs4U/_old 2014-12-22 12:52:55.000000000 +0100
+++ /var/tmp/diff_new_pack.SCJs4U/_new 2014-12-22 12:52:55.000000000 +0100
@@ -69,6 +69,9 @@
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
Patch3: ibus-provide-layout-variations.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+Patch30: boo906143-revert-session.patch
+
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
@@ -139,6 +142,7 @@
%setup -q
%patch3 -p0
+%patch30 -p1
cp %{SOURCE1} .
++++++ boo906143-revert-session.patch ++++++
Index: src/unix/ibus/mozc_engine.cc
===================================================================
--- src/unix/ibus/mozc_engine.cc (リビジョン 385)
+++ src/unix/ibus/mozc_engine.cc (リビジョン 386)
@@ -335,9 +335,14 @@
GetCandidateWindowHandler(engine)->Hide(engine);
property_handler_->ResetContentType(engine);
- // Do not call SubmitSession or RevertSession. Preedit string will commit on
- // Focus Out event automatically by ibus_engine_update_preedit_text_with_mode
- // which called in UpdatePreedit method.
+ // Note that the preedit string (if any) will be committed by IBus runtime
+ // because we are specifying |IBUS_ENGINE_PREEDIT_COMMIT| flag to
+ // |ibus_engine_update_preedit_text_with_mode|. All we need to do here is
+ // simply resetting the current session in case there is a non-empty
+ // preedit text. Note that |RevertSession| is supposed to do nothing when
+ // there is no preedit text.
+ // See https://code.google.com/p/mozc/issues/detail?id=255 for details.
+ RevertSession(engine);
SyncData(false);
}
@@ -668,6 +673,8 @@
}
void MozcEngine::RevertSession(IBusEngine *engine) {
+ // TODO(team): We should skip following actions when there is no on-going
+ // omposition.
commands::SessionCommand command;
command.set_type(commands::SessionCommand::REVERT);
commands::Output output;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
