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

diff --git a/ChangeLog b/ChangeLog
index b43a5af981ba0abb5e1d16d53d9d55af900fdec2..4fd1be109beffa7122103bc26296c37eb3ad13b5 100644 (file)
--- 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
 2008-07-05 [colin]     3.5.0cvs7
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index a3d6695ed19577f79b5fcdee093f6a49337b1c47..4e5ebe0b0376e307a1a130355b29d404d7b19291 100644 (file)
--- 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.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
index 7ce768c0e71cd43607e7c9a3c3cf3a18d07668d6..4a5ed157104e7f2e2de3e48a161a70bdcb7f6876 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=7
+EXTRA_VERSION=8

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/session.h b/src/common/session.h
index cc8aa37e5f3b008c1730523596718031725e235e..7f0b957a42f2ad82260dea7bc9b635e09bf468e4 100644 (file)
--- 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;
        
        gpointer send_data_progressive_notify_data;
        gpointer send_data_notify_data;
        

-       void *account;
+       const void *account;

        gboolean is_smtp;
 };
 
        gboolean is_smtp;
 };
 

diff --git a/src/common/ssl.c b/src/common/ssl.c
index 6a88b3db89c2ba86f8f320ea65d8b8bd1082985d..262bddb31c59d09500afc78dc87a2e89c9e1e6de 100644 (file)
--- 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/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;
 
                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/local/ssl/certs",
                "/etc/apache/ssl.crt",
                "/usr/share/curl",

+               "/usr/lib/ssl/certs",

                NULL};
        int i;
 
                NULL};
        int i;
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 13877211b21dc14b2469737e54c44d84214f2c1e..49ce861232cfbdad212adb8c03688601543b408a 100644 (file)
--- 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);
 
 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);
 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);
 
 static void prefs_account_signature_edit_cb    (GtkWidget      *widget,
                                                 gpointer        data);