Revision: 6484
Author: deton.kih
Date: Sat Jul 3 00:39:57 2010
Log: * gtk/gtk-im-uim.c
- (cand_activate_cb): Change value of accel_enumeration_hint
for table style candidate window workaround (r6443)
to avoid assertion failure in uim_get_candidate()
* xim/canddisp.cpp
- (Canddisp::adjust_display_limit): Ditto
* scm/tutcode.scm
- (tutcode-get-candidate-handler): Ditto
http://code.google.com/p/uim/source/detail?r=6484
Modified:
/trunk/gtk/gtk-im-uim.c
/trunk/scm/tutcode.scm
/trunk/xim/canddisp.cpp
=======================================
--- /trunk/gtk/gtk-im-uim.c Sun Jun 20 00:04:11 2010
+++ /trunk/gtk/gtk-im-uim.c Sat Jul 3 00:39:57 2010
@@ -724,7 +724,7 @@
if (UIM_IS_CAND_WIN_TBL_GTK(uic->cwin) && nr > display_limit) {
uim_candidate c;
const char *s;
- c = uim_get_candidate(uic->uc, 0, -1);
+ c = uim_get_candidate(uic->uc, 0, 9999);
s = uim_candidate_get_annotation_str(c);
#define LEN_DISPLAY_LIMIT 14
if (strncmp(s, "display_limit=", LEN_DISPLAY_LIMIT) == 0) {
=======================================
--- /trunk/scm/tutcode.scm Sun Jun 27 03:19:55 2010
+++ /trunk/scm/tutcode.scm Sat Jul 3 00:39:57 2010
@@ -1211,7 +1211,7 @@
;;; ¸õÊ䥦¥£¥ó¥É¥¦¤¬¸õÊäʸ»úÎó¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë¸Æ¤Ö´Ø¿ô
(define (tutcode-get-candidate-handler tc idx accel-enum-hint)
(cond
- ((= accel-enum-hint -1) ;XXX
ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦¤«¤é¤Îdisplay_limitÄ´À°»þ
+ ((= accel-enum-hint 9999) ;XXX
ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦¤«¤é¤Îdisplay_limitÄ´À°»þ
(set! tutcode-nr-candidate-max (length
tutcode-heading-label-char-list))
(set! tutcode-nr-candidate-max-for-kigou-mode
(length tutcode-heading-label-char-list-for-kigou-mode))
=======================================
--- /trunk/xim/canddisp.cpp Sun Jun 13 00:54:35 2010
+++ /trunk/xim/canddisp.cpp Sat Jul 3 00:39:57 2010
@@ -134,7 +134,7 @@
if (strstr(command, "/uim-candwin-tbl-") == NULL)
return display_limit;
- cand = uim_get_candidate(uc, 0, -1);
+ cand = uim_get_candidate(uc, 0, 9999);
s = uim_candidate_get_annotation_str(cand);
#define LEN_DISPLAY_LIMIT 14
if (strncmp(s, "display_limit=", LEN_DISPLAY_LIMIT) == 0) {
