evolution-mapi r18 - in trunk/src: account-setup-eplugin addressbook

[msuman svn gnome org]

Author: msuman
Date: Fri Nov 28 10:24:40 2008
New Revision: 18
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=18&view=rev

Log:
Don't add the GAL LDAP ESource.

Modified:
   trunk/src/account-setup-eplugin/ChangeLog
   trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c
   trunk/src/addressbook/ChangeLog
   trunk/src/addressbook/Makefile.am

Modified: trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c
==============================================================================
--- trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c	(original)
+++ trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c	Fri Nov 28 10:24:40 2008
@@ -456,26 +456,6 @@
 		g_object_unref (source);
 	}
 
-	//Add GAL
-	{
-		char *uri;
-		uri = g_strdup_printf("galldap://%s %s/;Global Address List", url->user, url->host);
-		source = e_source_new_with_absolute_uri ("Global Address List", uri);
-//		source = e_source_new ("Global Address List", g_strconcat (";","Global Address List" , NULL));
-		e_source_set_property (source, "auth", "plain/password");
-		e_source_set_property (source, "auth-domain", "GALLDAP");
-		e_source_set_property(source, "user", url->user);
-		e_source_set_property(source, "host", camel_url_get_param (url, "ad_server"));
-		e_source_set_property(source, "view-limit", camel_url_get_param (url, "ad_limit"));		
-		e_source_set_property(source, "profile", camel_url_get_param (url, "profile"));
-		e_source_set_property(source, "domain", camel_url_get_param (url, "domain"));
-//		e_source_set_property (source, "offline_sync", 
-//					       camel_url_get_param (url, "offline_sync") ? "1" : "0");
-		e_source_set_property(source, "offline_sync", "1");
-		e_source_set_property (source, "completion", "true");
-		e_source_group_add_source (group, source, -1);
-		g_object_unref (source);		
-	}
 	e_source_list_add_group (list, group, -1);
 	e_source_list_sync (list, NULL);
 	g_object_unref (group);

Modified: trunk/src/addressbook/Makefile.am
==============================================================================
--- trunk/src/addressbook/Makefile.am	(original)
+++ trunk/src/addressbook/Makefile.am	Fri Nov 28 10:24:40 2008
@@ -16,7 +16,7 @@
 
 libebookbackendmapi_la_LIBADD =			\
 	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la \
-	$(LIBEBACKEND_CFLAGS)			\
+	$(LIBEBACKEND_LIBS)			\
 	$(LIBEBOOK_LIBS)			\
 	$(LIBEDATABOOK_LIBS)			\
 	$(LIBMAPI_LIBS)