Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at Wed Jan 14 01:57:21 CET 2009. -------- --- scim-bridge/scim-bridge.changes 2009-01-05 08:57:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/scim-bridge/scim-bridge.changes 2009-01-13 09:05:48.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 13 08:47:50 CET 2009 - pwu@suse.de + +- bnc#465620: Fixes mis-order focus in/out event to scim-bridge, + refer to scim implementation as scim already does it. + Add a patch: scim-bridge-remember-focus-state.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- scim-bridge-remember-focus-state.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.m22084/_old 2009-01-14 01:56:51.000000000 +0100 +++ /var/tmp/diff_new_pack.m22084/_new 2009-01-14 01:56:51.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: docbook-xsl-stylesheets doxygen gtk2-devel intltool libqt4-devel qt3-devel scim-devel Summary: Scim Bridge Version: 0.4.15 -Release: 6 +Release: 7 License: LGPL v2.1 or later Group: System/I18n/Japanese AutoReqProv: on @@ -38,6 +38,7 @@ Patch3: bug-351920-should-return-retval.patch Patch4: scim-bridge-avoid-load-all-imengine.patch Patch5: scim-bridge-agent-add-frontend-mask.patch +Patch6: scim-bridge-remember-focus-state.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define gtk_prefix %(pkg-config --variable=prefix gtk+-2.0) @@ -88,6 +89,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 find . -type f | xargs chmod u+w #find . -name CVS -type d | xargs rm -r find . -name .cvsignore -type f | xargs rm -f @@ -175,6 +177,10 @@ %qt4_plugindir/inputmethods/im-scim-bridge*.so %changelog +* Tue Jan 13 2009 pwu@suse.de +- bnc#465620: Fixes mis-order focus in/out event to scim-bridge, + refer to scim implementation as scim already does it. + Add a patch: scim-bridge-remember-focus-state.patch. * Mon Jan 05 2009 pwu@suse.de - bnc#463495: Add ValidKeyMask functionality to scim-bridge, borrow some code from scim. ++++++ scim-bridge-remember-focus-state.patch ++++++ Index: scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp =================================================================== --- scim-bridge-0.4.15.orig/agent/scim-bridge-agent-imcontext.cpp +++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp @@ -146,6 +146,7 @@ class ScimBridgeAgentIMContextImpl: publ IMEngineInstancePointer imengine; bool enabled; + bool focused; scim_bridge_preedit_mode_t preedit_mode; bool preedit_shown; @@ -274,7 +275,7 @@ void ScimBridgeAgentIMContext::set_on_th ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener): -client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY), +client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY), preedit_shown (false), preedit_cursor_position (0) { if (free_imcontexts.empty ()) { @@ -646,6 +647,8 @@ void ScimBridgeAgentIMContextImpl::focus panel_listener->hide_aux_string (); panel_listener->hide_lookup_table (); hide_preedit (); + + focused = true; } @@ -653,6 +656,9 @@ void ScimBridgeAgentIMContextImpl::focus { ScimBridgeAgentIMContext *focused_imcontext = static_cast<ScimBridgeAgentIMContext*> (get_imengine ()->get_frontend_data ()); + if ( !focused ) + return; + get_imengine ()->set_frontend_data (static_cast<ScimBridgeAgentIMContext*> (this)); hide_preedit (); @@ -666,6 +672,8 @@ void ScimBridgeAgentIMContextImpl::focus } else { imengine->set_frontend_data (NULL); } + + focused = false; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org