talons

commit b59a753f22d378e2cac545f238629d4f950e201a
parent 8f865353a44c199080aa4d413536f84763dc98ba
Author: Colin Leroy <colin@colino.net>
Date:   Wed,  3 Nov 2010 11:39:58 +0000

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.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addrindex.c
 | 
8
+++-----

4 files changed, 11 insertions(+), 6 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -4056,3 +4056,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/addrindex.c b/src/addrindex.c
@@ -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;
 	}