2008-08-24 [colin] 3.5.0cvs70

	* src/common/ssl.c
		Fix typo on SSL_CERT_DIR

diff --git a/ChangeLog b/ChangeLog
index 5543a160d0f8f04ee787aee734d7c98533570b6b..21643d6b10ccc449af7f53e136001e8ff3b71ef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-24 [colin]     3.5.0cvs70
+
+       * src/common/ssl.c
+               Fix typo on SSL_CERT_DIR
+

 2008-08-23 [holger]    3.5.0cvs69
 
        * src/printing.c
 2008-08-23 [holger]    3.5.0cvs69
 
        * src/printing.c

diff --git a/PATCHSETS b/PATCHSETS
index 807aaa3936de7ebf3ce9bdecebaa8aad7bf5ec9d..2f7210452940efe10babd5a39bdbdad687aae239 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3481,3 +3481,4 @@
 ( cvs diff -u -r 1.382.2.469 -r 1.382.2.470 src/compose.c;  cvs diff -u -r 1.50.2.49 -r 1.50.2.50 src/compose.h;  cvs diff -u -r 1.274.2.268 -r 1.274.2.269 src/mainwindow.c;  cvs diff -u -r 1.395.2.382 -r 1.395.2.383 src/summaryview.c;  ) > 3.5.0cvs67.patchset
 ( cvs diff -u -r 1.274.2.269 -r 1.274.2.270 src/mainwindow.c;  ) > 3.5.0cvs68.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/printing.c;  ) > 3.5.0cvs69.patchset
 ( cvs diff -u -r 1.382.2.469 -r 1.382.2.470 src/compose.c;  cvs diff -u -r 1.50.2.49 -r 1.50.2.50 src/compose.h;  cvs diff -u -r 1.274.2.268 -r 1.274.2.269 src/mainwindow.c;  cvs diff -u -r 1.395.2.382 -r 1.395.2.383 src/summaryview.c;  ) > 3.5.0cvs67.patchset
 ( cvs diff -u -r 1.274.2.269 -r 1.274.2.270 src/mainwindow.c;  ) > 3.5.0cvs68.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/printing.c;  ) > 3.5.0cvs69.patchset

+( cvs diff -u -r 1.9.2.31 -r 1.9.2.32 src/common/ssl.c;  ) > 3.5.0cvs70.patchset

diff --git a/configure.ac b/configure.ac
index ae84b9838232b11c66687f315dd842762bf0bc8d..3e22a90c40aee7933a7e498149ec8a948b26f8de 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=69
+EXTRA_VERSION=70

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl.c b/src/common/ssl.c
index 262bddb31c59d09500afc78dc87a2e89c9e1e6de..13ea119982bc255a085000bacc0c7ba509438949 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -185,8 +185,8 @@ const gchar *claws_ssl_get_cert_dir(void)
                NULL};
        int i;
 
                NULL};
        int i;
 

-       if (g_getenv("SSL_CERT_FILE"))
-               return g_getenv("SSL_CERT_FILE");
+       if (g_getenv("SSL_CERT_DIR"))
+               return g_getenv("SSL_CERT_DIR");

 #ifndef G_OS_WIN32
        for (i = 0; cert_dirs[i]; i++) {
                if (is_dir_exist(cert_dirs[i]))
 #ifndef G_OS_WIN32
        for (i = 0; cert_dirs[i]; i++) {
                if (is_dir_exist(cert_dirs[i]))