talons

commit db2c77e5dab6d8643e12573b5dc66eb6ff4560bf
parent de1340d7e74ced3d8f386da2e2369170aab379b9
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  5 Jul 2008 09:14:43 +0000

2008-07-05 [colin]	3.5.0cvs8

	* src/prefs_account.c
	* src/common/session.h
		Fix warnings
	* src/common/ssl.c
		Add one path for certs

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/session.h
 | 
2
+-
M
src/common/ssl.c
 | 
3
+++
M
src/prefs_account.c
 | 
4
++--

6 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-05 [colin]	3.5.0cvs8
+
+	* src/prefs_account.c
+	* src/common/session.h
+		Fix warnings
+	* src/common/ssl.c
+		Add one path for certs
+
 2008-07-05 [colin]	3.5.0cvs7
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3419,3 +3419,4 @@
 ( cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/filtering.c;  cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/common/ssl_certificate.h;  cvs diff -u -r 1.1.4.102 -r 1.1.4.103 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/etpan/nntp-thread.c;  ) > 3.5.0cvs5.patchset
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/common/ssl.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/common/ssl.h;  cvs diff -u -r 1.4.2.29 -r 1.4.2.30 src/common/ssl_certificate.c;  ) > 3.5.0cvs6.patchset
 ( cvs diff -u -r 1.105.2.135 -r 1.105.2.136 src/prefs_account.c;  ) > 3.5.0cvs7.patchset
+( cvs diff -u -r 1.105.2.136 -r 1.105.2.137 src/prefs_account.c;  cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/common/session.h;  cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/common/ssl.c;  ) > 3.5.0cvs8.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/session.h b/src/common/session.h
@@ -155,7 +155,7 @@ struct _Session
 	gpointer send_data_progressive_notify_data;
 	gpointer send_data_notify_data;
 	
-	void *account;
+	const void *account;
 	gboolean is_smtp;
 };
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -153,6 +153,8 @@ const gchar *claws_ssl_get_cert_file(void)
 		"/usr/local/ssl/certs/ca-bundle.crt",
 		"/etc/apache/ssl.crt/ca-bundle.crt",
 		"/usr/share/curl/curl-ca-bundle.crt",
+		"/usr/share/curl/curl-ca-bundle.crt",
+		"/usr/lib/ssl/cert.pem",
 		NULL};
 	int i;
 
@@ -179,6 +181,7 @@ const gchar *claws_ssl_get_cert_dir(void)
 		"/usr/local/ssl/certs",
 		"/etc/apache/ssl.crt",
 		"/usr/share/curl",
+		"/usr/lib/ssl/certs",
 		NULL};
 	int i;
 
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -841,13 +841,13 @@ static void prefs_account_sigcmd_radiobtn_cb	(GtkWidget	*widget,
 
 static void prefs_account_signature_browse_cb	(GtkWidget	*widget,
 						 gpointer	 data);
-
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static void prefs_account_in_cert_browse_cb	(GtkWidget	*widget,
 						 gpointer	 data);
 
 static void prefs_account_out_cert_browse_cb	(GtkWidget	*widget,
 						 gpointer	 data);
-
+#endif
 static void prefs_account_signature_edit_cb	(GtkWidget	*widget,
 						 gpointer	 data);