From: Paul Mangan <paul@claws-mail.org>
Date: Sun, 16 Sep 2007 06:32:34 +0000 (+0000)
Subject: 2007-09-05 [colin]	3.0.0cvs7
X-Git-Tag: rel_3_1_0~223
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6960ebadb7d074fac3f5c8674cd5ad55bf3f54ff

2007-09-05 [colin]	3.0.0cvs7

	* src/ldaputil.c
		Fix build without USE_LDAP_TLS
---

diff --git a/ChangeLog b/ChangeLog
index edf3387b8..1ffd47de7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-05 [colin]	3.0.0cvs7
+
+	* src/ldaputil.c
+		Fix build without USE_LDAP_TLS
+
 2007-09-05 [colin]	3.0.0cvs6
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
index 7014b50c0..9561ce463 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2852,3 +2852,4 @@
 ( cvs diff -u -r 1.395.2.324 -r 1.395.2.325 src/summaryview.c;  ) > 3.0.0cvs4.patchset
 ( cvs diff -u -r 1.61.2.67 -r 1.61.2.68 src/account.c;  ) > 3.0.0cvs5.patchset
 ( cvs diff -u -r 1.213.2.158 -r 1.213.2.159 src/folder.c;  cvs diff -u -r 1.179.2.186 -r 1.179.2.187 src/imap.c;  cvs diff -u -r 1.149.2.80 -r 1.149.2.81 src/inc.c;  cvs diff -u -r 1.28.2.37 -r 1.28.2.38 src/mbox.c;  cvs diff -u -r 1.17.2.43 -r 1.17.2.44 src/send_message.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/statusbar.c;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/statusbar.h;  ) > 3.0.0cvs6.patchset
+( cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/ldaputil.c;  ) > 3.0.0cvs7.patchset
diff --git a/configure.ac b/configure.ac
index fd0595c6b..86e3c0cf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/ldaputil.c b/src/ldaputil.c
index 76f9fa7b5..618664090 100644
--- a/src/ldaputil.c
+++ b/src/ldaputil.c
@@ -228,9 +228,7 @@ GList *ldaputil_read_basedn(
 	LDAP *ld = NULL;
 	gint rc;
 	gchar *uri = NULL;
-#ifdef USE_LDAP_TLS
 	gint version;
-#endif
 
 	if( host == NULL ) return baseDN;
 	if( port < 1 ) return baseDN;