2004-09-02 [colin] 0.9.12cvs88.1

	* src/ldapquery.c
		Sync with HEAD (fix LDAP freezes)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 7b4251da4f6b6cd528f770bfbe916da1e1ca885a..eb2298855a198401d1f20c75929e2eef7758dd68 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-09-02 [colin]     0.9.12cvs88.1
+
+       * src/ldapquery.c
+               Sync with HEAD (fix LDAP freezes)
+
 2004-09-02 [colin]     0.9.12cvs87.1
 
        * src/prefs_spelling.c

diff --git a/PATCHSETS b/PATCHSETS
index bfcc7bfa28a8cc30335773e260ea0d959447b359..5b32cc51e7df33ccfb87debac0f09a18b8964c8e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -152,3 +152,4 @@
 ( cvs diff -u -r 1.213.2.14 -r 1.213.2.15 src/folder.c; ) > 0.9.12cvs85.1.patchset
 ( cvs diff -u -r 1.60.2.2 -r 1.60.2.3 src/filtering.c; cvs diff -u -r 1.207.2.13 -r 1.207.2.14 src/folderview.c; cvs diff -u -r 1.179.2.7 -r 1.179.2.8 src/imap.c; cvs diff -u -r 1.43.2.9 -r 1.43.2.10 src/prefs_matcher.c; cvs diff -u -r 1.25.2.6 -r 1.25.2.7 src/stock_pixmap.c; cvs diff -u -r 1.15.2.9 -r 1.15.2.10 src/summary_search.c; cvs diff -u -r 1.395.2.28 -r 1.395.2.29 src/summaryview.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/wizard.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/wizard.h; ) > 0.9.12cvs86.1.patchset
 ( cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/prefs_spelling.c; ) > 0.9.12cvs87.1.patchset
+( cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/ldapquery.c; ) > 0.9.12cvs88.1.patchset

diff --git a/configure.ac b/configure.ac
index f4953ce06849fa1cc486ad6cf2201964da0130a2..9a5fed26d71f071771ea254ab0dbade7bb165478 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=87
+EXTRA_VERSION=88
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/ldapquery.c b/src/ldapquery.c
index 9cfd504214f98c17817deda7da1d98c4b862972b..3afb70b93d4fe6003658c695e5bff4493fa63bf4 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -1371,25 +1371,16 @@ gint ldapqry_perform_locate( LdapQuery *qry ) {
 gboolean ldapquery_remove_results( LdapQuery *qry ) {
        gboolean retVal = FALSE;
 
-       /* Set query as aged - will be retired on a later call */
        ldapqry_set_aged_flag( qry, TRUE );
-       /*
-       printf( "ldapquery_remove_results...\n" );
-       printf( "testing busy flag...\n" );
-       */
+
        if( ldapqry_get_busy_flag( qry ) ) {
-               /* Query is still busy - cancel query */
-               /* printf( "\tquery is still busy running...\n" ); */
                ldapqry_set_stop_flag( qry, TRUE );
-
-               /* ldapqry_cancel( qry ); */
        }
        else {
-               /* Delete folder */
-               /* printf( "\tquery can be deleted!\n" ); */
-               /* ldapqry_delete_folder( qry ); */
+               LdapServer *server = qry->server;
+               server->listQuery = g_list_remove(server->listQuery, qry);
+
                retVal = TRUE;
-               /* printf( "\tquery deleted!\n" ); */
        }
        return retVal;
 }