2008-07-05 [colin] 3.5.0cvs8
authorColin Leroy <colin@colino.net>
Sat, 5 Jul 2008 09:14:43 +0000 (09:14 +0000)
committerColin Leroy <colin@colino.net>
Sat, 5 Jul 2008 09:14:43 +0000 (09:14 +0000)
* src/prefs_account.c
* src/common/session.h
Fix warnings
* src/common/ssl.c
Add one path for certs

ChangeLog
PATCHSETS
configure.ac
src/common/session.h
src/common/ssl.c
src/prefs_account.c

index b43a5af..4fd1be1 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
index a3d6695..4e5ebe0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 7ce768c..4a5ed15 100644 (file)
@@ -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=
 
index cc8aa37..7f0b957 100644 (file)
@@ -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;
 };
 
index 6a88b3d..262bddb 100644 (file)
@@ -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;
 
index 1387721..49ce861 100644 (file)
@@ -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);