[uim-commit] r306 - in trunk/qt: quiminputcontextplugin/src quiminputcontextplugin-qt4

[kzk@freedesktop.org]

Author: kzk
Date: 2005-01-16 03:36:47 -0800 (Sun, 16 Jan 2005)
New Revision: 306

Modified:
   trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
   trunk/qt/quiminputcontextplugin/src/quiminputcontext.cpp
Log:
* qt/quiminputcontext/src/quiminputcontext.cpp
  - (setFocus) : Fix occasional mismatch of helper
  label with focus in.  uim_helper_client_focus_in() is definitely
  needed to be called before uim_prop_list_update() and
  uim_prop_label_update.  This sequence is required to make sure the
  exsitence of only one focused context in whole desktop.
  This problem is originally reported by ekato, and I only applied
  his patch. Thanks!
* qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
  - Ditto



Modified: trunk/qt/quiminputcontextplugin/src/quiminputcontext.cpp
===================================================================
--- trunk/qt/quiminputcontextplugin/src/quiminputcontext.cpp	2005-01-16 10:49:15 UTC (rev 305)
+++ trunk/qt/quiminputcontextplugin/src/quiminputcontext.cpp	2005-01-16 11:36:47 UTC (rev 306)
@@ -265,9 +265,9 @@
 
     m_HelperManager->checkHelperConnection();
 
+    uim_helper_client_focus_in( m_uc );
     uim_prop_list_update( m_uc );
     uim_prop_label_update( m_uc );
-    uim_helper_client_focus_in( m_uc );
 }
 
 void QUimInputContext::unsetFocus()

Modified: trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
===================================================================
--- trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp	2005-01-16 10:49:15 UTC (rev 305)
+++ trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp	2005-01-16 11:36:47 UTC (rev 306)
@@ -238,10 +238,9 @@
 
     m_HelperManager->checkHelperConnection();
 
+    uim_helper_client_focus_in( m_uc );
     uim_prop_list_update( m_uc );
     uim_prop_label_update( m_uc );
-
-    uim_helper_client_focus_in( m_uc );
 }
 
 void QUimInputContext::unsetFocus()