rpms/scim-chewing/devel scim-chewing-0.3.1-10.bz237924.patch, NONE, 1.1 scim-chewing.spec, 1.32, 1.33

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/scim-chewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9307

Modified Files:
	scim-chewing.spec 
Added Files:
	scim-chewing-0.3.1-10.bz237924.patch 
Log Message:
* Wed Dec 20 2007 Caius Chance <cchance at redhat.com> 0.3.1-10.fc9
- Resolves: rhbz#237924 (Last candidate on lookup table is not a valid
                         candidate.)
  <<< Refit lookup table page size for last lookup page.



scim-chewing-0.3.1-10.bz237924.patch:

--- NEW FILE scim-chewing-0.3.1-10.bz237924.patch ---
diff -up scim-chewing-0.3.1/src/scim_chewing_imengine.cpp.orig scim-chewing-0.3.1/src/scim_chewing_imengine.cpp
--- scim-chewing-0.3.1/src/scim_chewing_imengine.cpp.orig	2007-12-20 06:43:51.000000000 +1000
+++ scim-chewing-0.3.1/src/scim_chewing_imengine.cpp	2007-12-20 06:44:31.000000000 +1000
@@ -610,16 +610,27 @@ bool ChewingIMEngineInstance::commit( Ch
 	
 	// show lookup table
         if ( !pgo->pci )
-            return true;
-	if ( pgo->pci->nPage != 0 ) {
-		m_lookup_table.update( pgo->pci );
-		update_lookup_table( m_lookup_table );
-		show_lookup_table();
-	}
-	else {
-		hide_lookup_table();
-	}
-	
+                return true;
+        if ( pgo->pci->nPage != 0 ) {
+                m_lookup_table.update( pgo->pci );
+                show_lookup_table();
+
+                if ( ( pgo->pci->nTotalChoice % pgo->pci->nChoicePerPage
+                != 0 ) && pgo->pci->pageNo == pgo->pci->nPage - 1 ) {
+                        m_lookup_table.set_page_size(
+                                pgo->pci->nTotalChoice %
+                                        pgo->pci->nChoicePerPage );
+                } else {
+                        m_lookup_table.set_page_size(
+                                pgo->pci->nChoicePerPage );
+                }
+
+                update_lookup_table( m_lookup_table );
+        }
+        else {
+                hide_lookup_table();
+        }
+
 	// show aux string
 	m_aux_string = L"";
 	if ( pgo->bShowMsg ) {


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- scim-chewing.spec	4 Jul 2007 09:03:36 -0000	1.32
+++ scim-chewing.spec	19 Dec 2007 06:35:34 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           scim-chewing
 Version:        0.3.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
 License:        GPL
@@ -16,6 +16,7 @@
 Patch2:         scim-chewing-0.3.1-6.bz206112.patch
 Patch3:         scim-chewing-0.3.1-8.bz206120.patch
 Patch4:         scim-chewing-0.3.1-9.bz216581.patch
+Patch5:         scim-chewing-0.3.1-10.bz237924.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -28,6 +29,7 @@
 %patch2 -p1 -b .3-bz206112
 %patch3 -p1 -b .4-bz206120
 %patch4 -p1 -b .5-bz216581
+%patch5 -p1 -b .6-bz237924
 
 %build
 %configure --disable-static
@@ -57,6 +59,11 @@
 
 
 %changelog
+* Wed Dec 20 2007 Caius Chance <cchance at redhat.com> 0.3.1-10.fc9
+- Resolves: rhbz#237924 (Last candidate on lookup table is not a valid 
+                         candidate.)
+  <<< Refit lookup table page size for last lookup page.
+
 * Wed Jul  4 2007 Jens Petersen <petersen at redhat.com>
 - remove with_libstdc_preview macro