im_canna.c: Fix "pointer type mismatch in conditional expression" error.

arakiken · Aug 13, 2024 · 8aef4fa · 8aef4fa
1 parent 2daa4e9
commit 8aef4fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2024-08-13  Araki Ken  <arakiken@users.sf.net>
 
+	* im_canna.c: Fix "pointer type mismatch in conditional expression" error.
+	  (https://github.com/arakiken/mlterm/issues/92#issuecomment-2282176739)
+
 	* vt_parser.c: Make Pcmh and Pcss of DECDLD omittable.
 
 	* vtetypebuiltins.c, reaper.c: Fix errors in -Werror=incompatible-pointer-types.

diff --git a/inputmethod/canna/im_canna.c b/inputmethod/canna/im_canna.c
@@ -428,7 +428,7 @@ static int key_event(ui_im_t *im, u_char key_char, KeySym ksym, XKeyEvent *event
       commit(canna, canna->buf);
       preedit(canna, "", 0, 0, cand);
     } else {
-      preedit(canna, canna->key_status.length > 0 ? canna->key_status.echoStr : "",
+      preedit(canna, canna->key_status.length > 0 ? ((char*)canna->key_status.echoStr) : "",
               canna->key_status.revPos, canna->key_status.revLen, cand);
     }