evolution-exchange r1643 - in trunk: . addressbook

[tml svn gnome org]

Author: tml
Date: Thu May  8 01:42:57 2008
New Revision: 1643
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1643&view=rev

Log:
2008-05-08  Tor Lillqvist  <tml novell com>

	* addressbook/e-book-backend-gal.c: Don't include <ldap.h> here,
	it or its Windows counterpart <winldap.h> has already been
	included through <e2k-global-catalog-ldap.h> anyway.
	(ber_dupbv): Need this on Windows, too.
	(ldap_op_finished): Use ldap_abandon() instead of the nonstandard
	ldap_abandon_ext(). The extra parameters were NULL anyway, meaning
	it is equivalent to calling ldap_abandon().



Modified:
   trunk/ChangeLog
   trunk/addressbook/e-book-backend-gal.c

Modified: trunk/addressbook/e-book-backend-gal.c
==============================================================================
--- trunk/addressbook/e-book-backend-gal.c	(original)
+++ trunk/addressbook/e-book-backend-gal.c	Thu May  8 01:42:57 2008
@@ -37,15 +37,6 @@
 #include <exchange-account.h>
 #include "exchange-component.h"
 
-#ifdef DEBUG
-#define LDAP_DEBUG
-#define LDAP_DEBUG_ADD
-#endif
-#include <ldap.h>
-#ifdef DEBUG
-#undef LDAP_DEBUG
-#endif
-
 #define d(x) x
 
 #include <sys/time.h>
@@ -1961,7 +1952,7 @@
 	}
 }
 
-#ifdef SUNLDAP
+#if defined (SUNLDAP) || defined (G_OS_WIN32)
 static struct berval *
 ber_dupbv( struct berval *dst, struct berval *src )
 {
@@ -2338,7 +2329,7 @@
 	/* ignore errors, its only best effort? */
 	g_mutex_lock (bl->priv->ldap_lock);
 	if (bl->priv->ldap)
-		ldap_abandon_ext (bl->priv->ldap, op->id, NULL, NULL);
+		ldap_abandon (bl->priv->ldap, op->id);
 	g_mutex_unlock (bl->priv->ldap_lock);
 }