Revision: 7027
Author:   ek.kato
Date:     Sun May  8 17:51:02 2011
Log:      * gtk/gtk-im-uim.c (im_uim_reset)
* scm/byeoru.scm (byeoru-reset-handler)
  - Follow the discussion in [Anthy-dev 2390].

http://code.google.com/p/uim/source/detail?r=7027

Modified:
 /trunk/gtk/gtk-im-uim.c
 /trunk/scm/byeoru.scm

=======================================
--- /trunk/gtk/gtk-im-uim.c     Sat May  7 07:55:59 2011
+++ /trunk/gtk/gtk-im-uim.c     Sun May  8 17:51:02 2011
@@ -1355,21 +1355,21 @@
   IMUIMContext *uic = IM_UIM_CONTEXT(ic);
 #if !defined(WORKAROUND_BROKEN_RESET_IN_GTK)
   uim_reset_context(uic->uc);
+  clear_cb(uic);
+  update_cb(uic);
 #else
   if (uic == focused_context) {
     uim_focus_out_context(uic->uc);
     uim_focus_in_context(uic->uc);
   } else {
     uim_reset_context(uic->uc);
+    clear_cb(uic);
+    update_cb(uic);
   }
 #endif
 #ifdef GDK_WINDOWING_X11
   im_uim_compose_reset(uic->compose);
 #endif
-#if !defined(WORKAROUND_BROKEN_RESET_IN_GTK)
-  clear_cb(uic);
-  update_cb(uic);
-#endif
 }

 static void
=======================================
--- /trunk/scm/byeoru.scm       Sat Mar 12 15:37:45 2011
+++ /trunk/scm/byeoru.scm       Sun May  8 17:51:02 2011
@@ -1909,7 +1909,9 @@
        (byeoru-flush-automata bc)
        ;; reset-handler does not commit a string
        (byeoru-clear! bc)
-       (byeoru-update-preedit bc))))
+        ;; preedit clearing should be handled in the bridges level
+        ;; (byeoru-update-preedit bc)
+        )))

 (define (byeoru-focus-out-handler bc)
   (if (byeoru-context-on? bc)

Reply via email to