Author: ek.kato
Date: Thu Apr 9 17:44:51 2009
New Revision: 5951
Modified:
trunk/scm/ajax-ime.scm
trunk/scm/social-ime.scm
Log:
* scm/ajax-ime.scm
* scm/social-ime.scm
- Revert r5949 and r5950 as they are too annoying.
Modified: trunk/scm/ajax-ime.scm
==============================================================================
--- trunk/scm/ajax-ime.scm (original)
+++ trunk/scm/ajax-ime.scm Thu Apr 9 17:44:51 2009
@@ -511,6 +511,8 @@
(ajax-ime-make-raw-string (ajax-ime-get-raw-str-seq ac) wide? upper?)))
(define (ajax-ime-init-handler id im arg)
+ (if ajax-ime-warn-connection?
+ (uim-notify-info (N_ "Caveat: All the request to Ajax-IME/ChaIME
server is not encrypted through the internet.\nIf you want to disable this
message, turn off the option in Ajax-IME (advanced) setting.")))
(if (not ajax-ime-init-lib-ok?)
(begin
(ajax-ime-lib-init)
@@ -1466,10 +1468,6 @@
(ajax-ime-lib-reset-conversion ac))
(ajax-ime-flush ac))))
-(define (ajax-ime-focus-in-handler ac)
- (if ajax-ime-warn-connection?
- (uim-notify-info (N_ "Caveat: All the request to Ajax-IME/ChaIME
server is not encrypted through the internet.\nIf you want to disable this
message, turn off the option in Ajax-IME (advanced) setting."))))
-
;;;
(define (ajax-ime-get-candidate-handler ac idx ascel-enum-hint)
(let* ((cur-seg (ustr-cursor-pos (ajax-ime-context-segments ac)))
@@ -1503,7 +1501,7 @@
ajax-ime-set-candidate-index-handler
context-prop-activate-handler
#f
- ajax-ime-focus-in-handler
+ #f
#f
#f
#f
Modified: trunk/scm/social-ime.scm
==============================================================================
--- trunk/scm/social-ime.scm (original)
+++ trunk/scm/social-ime.scm Thu Apr 9 17:44:51 2009
@@ -581,6 +581,8 @@
(social-ime-make-raw-string (social-ime-get-raw-str-seq sc) wide?
upper?)))
(define (social-ime-init-handler id im arg)
+ (if social-ime-warn-connection?
+ (uim-notify-info (N_ "Caveat: All the request to Social IME server is
not encrypted through the internet.\nIf you want to disable this message,
turn off the option in Social-IME (advanced) setting.")))
(if (not social-ime-init-lib-ok?)
(begin
(social-ime-lib-init)
@@ -1785,10 +1787,6 @@
(social-ime-lib-reset-conversion sc))
(social-ime-flush sc))))
-(define (social-ime-focus-in-handler sc)
- (if social-ime-warn-connection?
- (uim-notify-info (N_ "Caveat: All the request to Social IME server is
not encrypted through the internet.\nIf you want to disable this message,
turn off the option in Social-IME (advanced) setting."))))
-
;;;
(define (social-ime-get-candidate-handler sc idx ascel-enum-hint)
(let* ((cur-seg (ustr-cursor-pos (social-ime-context-segments sc)))
@@ -1828,7 +1826,7 @@
social-ime-set-candidate-index-handler
context-prop-activate-handler
#f
- social-ime-focus-in-handler
+ #f
#f
#f
#f
