evolution-data-server r9501 - branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap

[msuman svn gnome org]

Author: msuman
Date: Tue Sep  9 10:05:32 2008
New Revision: 9501
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9501&view=rev

Log:
MAPI: Fixed a build break in GAL LDAP backend.

Modified:
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/e-book-backend-galldap.c

Modified: branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am	Tue Sep  9 10:05:32 2008
@@ -1,11 +1,14 @@
+# Fix the code to not use E_DATA_SERVER_UI_CFLAGS
+
 INCLUDES =						\
-	-DG_LOG_DOMAIN=\"libebookbackend\"		\
+	-DG_LOG_DOMAIN=\"libebookbackendgalldap\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	-I$(top_srcdir)/servers/exchange/storage	\
 	-I$(top_srcdir)/servers/exchange/lib		\
+	$(E_DATA_SERVER_UI_CFLAGS) 			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(LDAP_CFLAGS)					\
 	$(DB_CFLAGS)

Modified: branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/e-book-backend-galldap.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/e-book-backend-galldap.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/e-book-backend-galldap.c	Tue Sep  9 10:05:32 2008
@@ -2427,7 +2427,7 @@
 		if (limit <= 0)
 			limit = 500;
 	}
-	bl->priv->gc = e2k_global_catalog_new (bl->priv->server, limit, user, domain, NULL);
+	bl->priv->gc = e2k_global_catalog_new (bl->priv->server, limit, user, domain, NULL, E2K_AUTOCONFIG_USE_GAL_DEFAULT);
   	bl->priv->gal_uri = g_strdup (uri);
   	tokens = g_strsplit (uri, ";", 2);
   	g_free (uri);