From a3712128e42344b27fd6016938d325fb0040254b Mon Sep 17 00:00:00 2001
From: Match Grun <match@dimensional.com>
Date: Sun, 7 Sep 2003 19:31:26 +0000
Subject: [PATCH 1/1] LDAP static search

---
 ChangeLog.claws  | 17 +++++++++++++++++
 configure.ac     |  2 +-
 src/Makefile.am  |  1 +
 src/addr_compl.c | 17 +++++++++--------
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4e437aa22..ec4ab23a8 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,20 @@
+2003-09-07 [match]	0.9.4claws70
+	* src/Makefile.am
+	* src/addr_compl.c
+	* src/addressbook.c
+	* src/addressitem.h
+	* src/addrindex.c
+	* src/addritem.c
+	* src/addritem.h
+	* src/addrquery.c			** NEW **
+	* src/addrquery.h
+	* src/ldapquery.c
+	* src/ldapserver.c
+	* src/stock_pixmap.c
+	* src/stock_pixmap.h
+	* src/pixmaps/address_search.xpm	** NEW **
+		re-introduce Lookup button for LDAP 'static' searches.
+
 2003-09-07 [alfons]	0.9.4claws69
 	
 	* src/summaryview.c
diff --git a/configure.ac b/configure.ac
index e9987f171..68ac3859d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/Makefile.am b/src/Makefile.am
index 0926c0d85..07ebcfdd2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ sylpheed_SOURCES = \
 	addrharvest.c \
 	addrindex.c \
 	addritem.c \
+	addrquery.c \
 	addrselect.c \
 	alertpanel.c \
 	codeconv.c \
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 67000dc57..de9368444 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -550,7 +550,7 @@ static gint _queryID_ = 0;
 /**
  * Completion idle ID.
  */
-static gint _completionIdleID_ = 0;
+static guint _completionIdleID_ = 0;
 
 /*
  * address completion entry ui. the ui (completion list was inspired by galeon's
@@ -800,17 +800,18 @@ static gint addrcompl_callback(
 
 	/* printf( "addrcompl_callback::queryID=%d\n", queryID ); */
 	pthread_mutex_lock( & _completionMutex_ );
-	if( queryID == _queryID_ ) {
-		/* Append contents to end of display queue */
-		node = listEMail;
-		while( node ) {
-			ItemEMail *email = node->data;
-			if( target ) {
+	if( target ) {
+		if( queryID == _queryID_ ) {
+			/* Append contents to end of display queue */
+			node = listEMail;
+			while( node ) {
+				ItemEMail *email = node->data;
+
 				address = addritem_format_email( email );
 				/* printf( "\temail/address ::%s::\n", address ); */
 				_displayQueue_ = g_list_append( _displayQueue_, address );
+				node = g_list_next( node );
 			}
-			node = g_list_next( node );
 		}
 	}
 	pthread_mutex_unlock( & _completionMutex_ );
-- 
2.25.1