talons

commit 6df7cd1377167c0e0fd6b71f29d6204182546faf
parent cf4b47c8a0017a6b1374534d18a40a5876bd1313
Author: Colin Leroy <colin@colino.net>
Date:   Mon,  6 Oct 2008 05:32:00 +0000

2008-10-06 [colin]	3.6.0cvs7

	* src/common/ssl.c
		Fix return value when setting client cert

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/ssl.c
 | 
10
+++++-----

4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-06 [colin]	3.6.0cvs7
+
+	* src/common/ssl.c
+		Fix return value when setting client cert
+
 2008-10-04 [colin]	3.6.0cvs6
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3563,3 +3563,4 @@
 ( cvs diff -u -r 1.60.2.124 -r 1.60.2.125 src/addressbook.c;  cvs diff -u -r 1.382.2.481 -r 1.382.2.482 src/compose.c;  cvs diff -u -r 1.274.2.275 -r 1.274.2.276 src/mainwindow.c;  cvs diff -u -r 1.94.2.188 -r 1.94.2.189 src/messageview.c;  cvs diff -u -r 1.395.2.393 -r 1.395.2.394 src/summaryview.c;  ) > 3.6.0cvs4.patchset
 ( cvs diff -u -r 1.274.2.276 -r 1.274.2.277 src/mainwindow.c;  ) > 3.6.0cvs5.patchset
 ( cvs diff -u -r 1.83.2.144 -r 1.83.2.145 src/mimeview.c;  ) > 3.6.0cvs6.patchset
+( cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/common/ssl.c;  ) > 3.6.0cvs7.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -132,7 +132,7 @@ static int gnutls_client_cert_cb(gnutls_session session,
 		st->deinit_all = 0;
 		return 0;
 	}
-	return -1;
+	return 0;
 }
 #endif
 
@@ -157,8 +157,8 @@ const gchar *claws_ssl_get_cert_file(void)
 		"/usr/lib/ssl/cert.pem",
 		NULL};
 	int i;
-
-    	if (g_getenv("SSL_CERT_FILE"))
+    	
+	if (g_getenv("SSL_CERT_FILE"))
 		return g_getenv("SSL_CERT_FILE");
 #ifndef G_OS_WIN32
 	for (i = 0; cert_files[i]; i++) {
@@ -184,8 +184,8 @@ const gchar *claws_ssl_get_cert_dir(void)
 		"/usr/lib/ssl/certs",
 		NULL};
 	int i;
-
-    	if (g_getenv("SSL_CERT_DIR"))
+    	
+	if (g_getenv("SSL_CERT_DIR"))
 		return g_getenv("SSL_CERT_DIR");
 #ifndef G_OS_WIN32
 	for (i = 0; cert_dirs[i]; i++) {