2005-09-17 [colin] 1.9.14cvs37

	* src/addrindex.c
		bugfix for NO-USE LDAP compilation, patch
		by Fabien Vantard

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 31ec99632cb4da02fb45aa7e2361313c0490c39c..f538245f5ca735da3b47252c9ce843366f4be804 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-09-17 [colin]     1.9.14cvs37
+
+       * src/addrindex.c
+               bugfix for NO-USE LDAP compilation, patch 
+               by Fabien Vantard
+
 2005-09-17 [colin]     1.9.14cvs36
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index aff5fb3c78ebc89d4b2ba90501ff4e0331dc16c8..8140d90c5c95ab3bd3c52f5202f4b9d9d00fb1a2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -805,3 +805,4 @@
 ( cvs diff -u -r 1.654.2.844 -r 1.654.2.845 configure.ac;  cvs diff -u -r 1.155.2.31 -r 1.155.2.32 src/Makefile.am;  cvs diff -u -r 1.27.2.12 -r 1.27.2.13 src/addr_compl.c;  cvs diff -u -r 1.28.2.8 -r 1.28.2.9 src/addrindex.c;  cvs diff -u -r 1.2.4.7 -r 1.2.4.8 src/browseldap.c;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/editldap.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/ldaplocate.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/ldapquery.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapquery.h;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/ldapserver.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/ldapserver.h;  cvs diff -u -r 1.115.2.53 -r 1.115.2.54 src/main.c;  cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/matcher_parser_parse.y;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_themes.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/Makefile.am;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/description_window.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/trayicon/Makefile.am;  ) > 1.9.14cvs34.patchset
 ( cvs diff -u -r 1.18.2.11 -r 1.18.2.12 src/jpilot.c;  ) > 1.9.14cvs35.patchset
 ( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 src/prefs_actions.c;  cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.23 -r 1.43.2.24 src/prefs_matcher.c;  cvs diff -u -r 1.30.2.16 -r 1.30.2.17 src/prefs_toolbar.c;  ) > 1.9.14cvs36.patchset
+( cvs diff -u -r 1.28.2.9 -r 1.28.2.10 src/addrindex.c;  ) > 1.9.14cvs37.patchset

diff --git a/configure.ac b/configure.ac
index af25d412956cfa8da90c421f750d8bbce08e0246..839473533a227cd3dfb5d58e2f74aa5b9f52d285 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrindex.c b/src/addrindex.c
index 74b417a17c0bb322e942314413c0f7ddf42a9231..309c5105205d2a777202b51f8d698a10bcfdba92 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -2540,10 +2540,10 @@ LdapQuery *ldapsvr_new_dynamic_search(
                LdapServer *server, QueryRequest *req );
 LdapQuery *ldapsvr_new_explicit_search(
                LdapServer *server, QueryRequest *req, ItemFolder *folder );
+void ldapsvr_execute_query( LdapServer *server, LdapQuery *qry );
 
 #endif
 
-void ldapsvr_execute_query( LdapServer *server, LdapQuery *qry );
 /**
  * Execute the previously registered dynamic search.
  *