[uim commit] r5711 - in trunk: gtk scm xim

[codesite-noreply]

Author: iratqq
Date: Wed Jan 14 06:13:30 2009
New Revision: 5711
Modified:
   trunk/gtk/gtk-im-uim.c
   trunk/scm/action.scm
   trunk/scm/im-custom.scm
   trunk/xim/ximserver.cpp

Log:
* scm/im-custom.scm (bridge-show-with?):
* scm/action.scm (context-propagate-prop-list-update):
* gtk/gtk-im-uim.c (update_prop_list_cb):
* xim/ximserver.cpp (InputContext::update_prop_list):
  - Simplify symbol name. 'time and 'mode.


Modified: trunk/gtk/gtk-im-uim.c
==============================================================================
--- trunk/gtk/gtk-im-uim.c      (original)
+++ trunk/gtk/gtk-im-uim.c      Wed Jan 14 06:13:30 2009
@@ -647,7 +647,7 @@
        caret_state_indicator_set_timeout(uic->caret_state_indicator,
                                        timeout * 1000);
       gtk_widget_show_all(uic->caret_state_indicator);
-    } else if  
(strcmp(show_state_with, "bridge-show-input-state-with-mode") == 0) {
+    } else if (strcmp(show_state_with, "mode") == 0) {
       gtk_widget_hide(uic->caret_state_indicator);
     }
   }

Modified: trunk/scm/action.scm
==============================================================================
--- trunk/scm/action.scm        (original)
+++ trunk/scm/action.scm        Wed Jan 14 06:13:30 2009
@@ -360,7 +360,7 @@
                          widgets))
           (widget-config-tree (apply string-append branches)))
       (if (eq? bridge-show-with?
-               'bridge-show-input-state-with-mode)
+               'mode)
           (if (eq? (context-current-mode context) 0)
               (set! bridge-show-input-state? #f)
               (begin

Modified: trunk/scm/im-custom.scm
==============================================================================
--- trunk/scm/im-custom.scm     (original)
+++ trunk/scm/im-custom.scm     Wed Jan 14 06:13:30 2009
@@ -486,13 +486,13 @@
   (N_ "Show input mode nearby cursor")
   (N_ "long description will be here."))

-(define-custom 'bridge-show-with? 'bridge-show-input-state-with-time
+(define-custom 'bridge-show-with? 'time
   '(global visual-preference)
   (list 'choice
-        (list 'bridge-show-input-state-with-mode
+        (list 'mode
               (N_ "With mode")
               (N_ "long description will be here."))
-        (list 'bridge-show-input-state-with-time
+        (list 'time
               (N_ "With time")
               (N_ "long description will be here.")))
   (N_ "Show input mode")

Modified: trunk/xim/ximserver.cpp
==============================================================================
--- trunk/xim/ximserver.cpp     (original)
+++ trunk/xim/ximserver.cpp     Wed Jan 14 06:13:30 2009
@@ -1109,7 +1109,7 @@
        disp->show_caret_state(label, timeout);
        free(label);
        mCaretStateShown = true;
-    } else if  
(strcmp(show_caret_with, "bridge-show-input-state-with-mode") == 0) {
+    } else if (strcmp(show_caret_with, "mode") == 0) {
        Canddisp *disp = canddisp_singleton();
        disp->hide_caret_state();
     }