2010-11-03 [colin] 3.7.6cvs61
authorColin Leroy <colin@colino.net>
Wed, 3 Nov 2010 11:39:58 +0000 (11:39 +0000)
committerColin Leroy <colin@colino.net>
Wed, 3 Nov 2010 11:39:58 +0000 (11:39 +0000)
* src/addrindex.c
Fix bug 2294, "addrindex.c: address index conversion always
fails". Clearly a copy-paste-bug. Patch by Nicolas Kaiser.

ChangeLog
PATCHSETS
configure.ac
src/addrindex.c

index bd9e013263a053e40cbea522b1df20d9e6c9a2bb..2e253a925a3b651926842ed561b7d121fd4077c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-03 [colin]     3.7.6cvs61
+
+       * src/addrindex.c
+               Fix bug 2294, "addrindex.c: address index conversion always
+               fails". Clearly a copy-paste-bug. Patch by Nicolas Kaiser.
+
 2010-11-02 [wwp]       3.7.6cvs60
 
        * src/action.c
index a57ae1d3a8d7a466f40f2540021f0c60ec50725c..30c8ca948d7774dd67e9582f2e8b0d59c94f33b0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/imap_gtk.c;  cvs diff -u -r 1.2.2.37 -r 1.2.2.38 src/mh_gtk.c;  ) > 3.7.6cvs58.patchset
 ( cvs diff -u -r 1.101.2.61 -r 1.101.2.62 src/news.c;  ) > 3.7.6cvs59.patchset
 ( cvs diff -u -r 1.12.2.61 -r 1.12.2.62 src/action.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/statusbar.c;  cvs diff -u -r 1.43.2.120 -r 1.43.2.121 src/toolbar.c;  ) > 3.7.6cvs60.patchset
+( cvs diff -u -r 1.28.2.43 -r 1.28.2.44 src/addrindex.c;  ) > 3.7.6cvs61.patchset
index e48a0e3252e910d4dbbc60cbf78cf54c1be91eee..51e85b7a267f820e65ebd7cdb919e8a17d5ca371 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 30a46f424da9616e3c88afad08370adbd6e334ef..cb7044d24b31c844e5932102ee1fda3bb7171d6f 100644 (file)
@@ -2343,12 +2343,10 @@ gint addrindex_read_data( AddressIndex *addrIndex ) {
        addrindex_read_file( addrIndex );
        if( addrIndex->retVal == MGU_SUCCESS ) {
                if( addrIndex->needsConversion ) {
-                       if( addrindex_convert_data( addrIndex ) == MGU_SUCCESS ) {
+                       if( addrindex_convert_data( addrIndex ) == MGU_SUCCESS )
+                               addrIndex->conversionError = FALSE;
+                       else
                                addrIndex->conversionError = TRUE;
-                       }
-                       else {
-                               addrIndex->conversionError = TRUE;
-                       }
                }
                addrIndex->dirtyFlag = TRUE;
        }