merge with bugfix 7053983
authormkaz
Fri, 17 Jun 2011 14:46:10 +0900
changeset 689 47c87ad3c3cc
parent 688 21d10476a7ac (current diff)
parent 686 fd67a190c4bd (diff)
child 690 a6fed9ac61af
merge with bugfix 7053983
imf-selector/src/imf-selector
--- a/iiim/build/src/im-sdk/iiimsf/src/IIIMP_ICState.cpp	Wed Jun 15 16:15:23 2011 +0900
+++ b/iiim/build/src/im-sdk/iiimsf/src/IIIMP_ICState.cpp	Fri Jun 17 14:46:10 2011 +0900
@@ -930,8 +930,8 @@
     IIIMP_contents *pcon;
 
     if (!pshared->preedit) {
-	LOG_ERROR("preedit has not been enabled yet. (%d, %d)",
-		  get_im_id(), get_ic_id());
+        /* preedit has not yet enabled or not needed for selected engine */
+        return -1;
     }
 
     if (pimpdraw->text) {
--- a/imf-selector/src/imf-selector	Wed Jun 15 16:15:23 2011 +0900
+++ b/imf-selector/src/imf-selector	Fri Jun 17 14:46:10 2011 +0900
@@ -248,11 +248,11 @@
         gtk.main()
 
     def init_priorui(self, script, engine, id):
-        msg = _("Found Input Method '%s' under '%s' framework on "\
+        msg = _("Found Input Method '%(engine)s' under '%(imf)s' framework on "\
                 "system for this locale.\n Do you use this Input Method "\
                 "in your desktop ?\n"\
                 "This configuration becomes effective "\
-                "from next desktop login.") %(engine, id)
+                "from next desktop login.") % {"engine": engine, "imf": id}
         if(id in self.MSGS):
             msg = msg+"\n\n"+self.MSGS[id]