[uim-commit] r720 - in trunk/qt: . quiminputcontextplugin-qt4

[ekato at freedesktop.org]

Author: ekato
Date: 2005-02-24 17:08:40 -0800 (Thu, 24 Feb 2005)
New Revision: 720

Modified:
   trunk/qt/immodule-qhelpermanager.cpp
   trunk/qt/pref-qt.cpp
   trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp
Log:
* qt/immodule-qhelpermanager.cpp (update_prop_list_cb) : Send
  prop_list_update message on a focused context only.
(update_prop_label_cb) : Send prop_label_update message on a
  focused context only.
* qt/quiminputcontextplugin-qt4/qhelpermanager.cpp : Ditto.


Modified: trunk/qt/immodule-qhelpermanager.cpp
===================================================================
--- trunk/qt/immodule-qhelpermanager.cpp	2005-02-24 20:15:02 UTC (rev 719)
+++ trunk/qt/immodule-qhelpermanager.cpp	2005-02-25 01:08:40 UTC (rev 720)
@@ -220,6 +220,10 @@
 
 void QUimHelperManager::update_prop_list_cb( void *ptr, const char *str )
 {
+    QUimInputContext *ic = ( QUimInputContext* ) ptr;
+    if ( ic != focusedInputContext )
+        return;
+
     QString msg = "prop_list_update\ncharset=UTF-8\n";
     msg += QString::fromUtf8( str );
 
@@ -228,6 +232,10 @@
 
 void QUimHelperManager::update_prop_label_cb( void *ptr, const char *str )
 {
+    QUimInputContext *ic = ( QUimInputContext* ) ptr;
+    if ( ic != focusedInputContext )
+        return;
+
     QString msg = "prop_label_update\ncharset=UTF-8\n";
     msg += QString::fromUtf8( str );
 

Modified: trunk/qt/pref-qt.cpp
===================================================================
--- trunk/qt/pref-qt.cpp	2005-02-24 20:15:02 UTC (rev 719)
+++ trunk/qt/pref-qt.cpp	2005-02-25 01:08:40 UTC (rev 720)
@@ -112,7 +112,7 @@
                                                 this );
         d->setCaption( _("~/.uim exists!") );
         d->exec();
-        delete d;
+        //delete d;
     }
 }
 

Modified: trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp
===================================================================
--- trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp	2005-02-24 20:15:02 UTC (rev 719)
+++ trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp	2005-02-25 01:08:40 UTC (rev 720)
@@ -195,6 +195,10 @@
 
 void QUimHelperManager::update_prop_list_cb( void *ptr, const char *str )
 {
+    QUimInputContext *ic = ( QUimInputContext* ) ptr;
+    if (ic != focusedInputContext)
+        return;
+
     QString msg = "prop_list_update\ncharset=UTF-8\n";
     msg += QString::fromUtf8( str );
 
@@ -203,6 +207,10 @@
 
 void QUimHelperManager::update_prop_label_cb( void *ptr, const char *str )
 {
+    QUimInputContext *ic = ( QUimInputContext* ) ptr;
+    if (ic != focusedInputContext)
+        return;
+
     QString msg = "prop_label_update\ncharset=UTF-8\n";
     msg += QString::fromUtf8( str );