talons

commit de1340d7e74ced3d8f386da2e2369170aab379b9
parent 6ce4075695e4708a67c3efee0aa95c553b4c7906
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  5 Jul 2008 07:49:32 +0000

2008-07-05 [colin]	3.5.0cvs7

	* src/prefs_account.c
		Fix no-ssl build

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_account.c
 | 
2
+-

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git 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
diff --git 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.135 -r 1.105.2.136 src/prefs_account.c;  ) > 3.5.0cvs7.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=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git 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);
 }
-#endif
 
 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;
 }
+#endif
 
 static void register_advanced_page(void)
 {