2008-07-05 [colin] 3.5.0cvs7

	* src/prefs_account.c
		Fix no-ssl build

diff --git a/ChangeLog b/ChangeLog
index 565c7c2ddf44d60f9337e50a3456e80525811871..b43a5af981ba0abb5e1d16d53d9d55af900fdec2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-05 [colin]     3.5.0cvs7
+
+       * src/prefs_account.c
+               Fix no-ssl build
+

 2008-07-04 [colin]     3.5.0cvs6
 
        * src/common/ssl.c
 2008-07-04 [colin]     3.5.0cvs6
 
        * src/common/ssl.c

diff --git a/PATCHSETS b/PATCHSETS
index 9f1776b86d3b50c9eb6a1580e94ab7865384eabe..a3d6695ed19577f79b5fcdee093f6a49337b1c47 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3418,3 +3418,4 @@
 ( cvs diff -u -r 1.105.2.134 -r 1.105.2.135 src/prefs_account.c;  ) > 3.5.0cvs4.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.134 -r 1.105.2.135 src/prefs_account.c;  ) > 3.5.0cvs4.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

diff --git a/configure.ac b/configure.ac
index 2f4b57c1ba1b38e17bec08742d454cbf2eadf575..7ce768c0e71cd43607e7c9a3c3cf3a18d07668d6 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=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index b26562c0549290812bd25da8c673ba324c87bf16..13877211b21dc14b2469737e54c44d84214f2c1e 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -3214,7 +3214,6 @@ static void register_ssl_page(void)
 
        prefs_account_register_page((PrefsPage *) &ssl_page);
 }
 
        prefs_account_register_page((PrefsPage *) &ssl_page);
 }

-#endif

 
 static gboolean sslcert_get_client_cert_hook(gpointer source, gpointer data)
 {
 
 static gboolean sslcert_get_client_cert_hook(gpointer source, gpointer data)
 {


@@ -3278,6 +3277,7 @@ static gboolean sslcert_get_password(gpointer source, gpointer data)
 
        return TRUE;
 }
 
        return TRUE;
 }

+#endif

 
 static void register_advanced_page(void)
 {
 
 static void register_advanced_page(void)
 {