[uim commit] r5695 - in uim-chewing-trunk: . src

[codesite-noreply]

Author: ek.kato
Date: Mon Jan  5 19:49:01 2009
New Revision: 5695
Modified:
   uim-chewing-trunk/configure.ac
   uim-chewing-trunk/src/chewing.c

Log:
* src/chewing.c (check_output) : Bug fix.
* configure.ac : Bump version.


Modified: uim-chewing-trunk/configure.ac
==============================================================================
--- uim-chewing-trunk/configure.ac      (original)
+++ uim-chewing-trunk/configure.ac      Mon Jan  5 19:49:01 2009
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)

-AC_INIT([uim-chewing], [0.0.4])
+AC_INIT([uim-chewing], [0.0.4.1])
 AM_INIT_AUTOMAKE(1.8.3)
 AC_CONFIG_HEADER([config.h])

@@ -15,7 +15,7 @@
 CHEWING_DATADIR=`$PKG_CONFIG chewing --variable=datadir`
 AC_DEFINE_UNQUOTED(CHEWING_DATADIR, "$CHEWING_DATADIR", [Chewing data dir])

-PKG_CHECK_MODULES(UIM, [uim >= 1.5.0])
+PKG_CHECK_MODULES(UIM, [uim >= 1.5.0 uim < 1.6.0])
 UIM_LIBDIR=`$PKG_CONFIG uim --variable=libdir`
 UIM_SCMDIR=`$PKG_CONFIG uim --variable=uim_scmdir`
 uim_pixmapsdir=`$PKG_CONFIG uim --variable=uim_datadir`/pixmaps

Modified: uim-chewing-trunk/src/chewing.c
==============================================================================
--- uim-chewing-trunk/src/chewing.c     (original)
+++ uim-chewing-trunk/src/chewing.c     Mon Jan  5 19:49:01 2009
@@ -396,12 +396,10 @@
   n_page = chewing_cand_TotalPage(cc);
   page_no = chewing_cand_CurrentPage(cc);
   if (!chewing_cand_CheckDone(cc) && n_page != 0) {
-    if (page_no == 0 && ucc->prev_page == -1 || ucc->prev_cursor !=  
cursor_pos) {
+    if (page_no == 0) {
       activate_candwin(ucc);
       ucc->has_active_candwin = 1;
-    } else if ((page_no == ucc->prev_page + 1) ||
-              (page_no == 0 &&
-               ucc->prev_page == n_page - 1)) {
+    } else if (page_no == ucc->prev_page + 1) {
       if (ucc->has_active_candwin) {
        shift_candwin(ucc, 1);
       }