[evolution-patches] patch for e-d-s bug #55776

[Chris Toshok <toshok ximian com>]

Just need a body to the ldap ::remove method.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/ChangeLog,v
retrieving revision 1.121
diff -u -r1.121 ChangeLog
--- ChangeLog	7 Apr 2004 23:37:37 -0000	1.121
+++ ChangeLog	13 Apr 2004 18:45:47 -0000
@@ -1,3 +1,19 @@
+2004-04-13  Chris Toshok  <toshok ximian com>
+
+	[ fixes bug #55776 ]
+	
+	* backends/ldap/e-book-backend-ldap.c
+	(e_book_backend_ldap_remove): new method, we need this or else
+	e-d-s exits when you try to remove an LDAP addressbook.
+	(e_book_backend_ldap_class_init): hook up
+	EBookBackendClass::remove.
+
+2004-04-12  Chris Toshok  <toshok ximian com>
+
+	* libebook/e-contact.c (e_contact_set_property): remove the
+	MULTI_ELEM attribute if the string is NULL or empty.  This keeps
+	us from writing out empty EMAIL attributes.
+
 2004-04-07  Chris Toshok  <toshok ximian com>
 
 	* libebook/e-vcard.h: reorder the EVC_X #defines a bit, and add in
Index: backends/ldap/e-book-backend-ldap.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/ldap/e-book-backend-ldap.c,v
retrieving revision 1.14
diff -u -r1.14 e-book-backend-ldap.c
--- backends/ldap/e-book-backend-ldap.c	6 Apr 2004 18:43:08 -0000	1.14
+++ backends/ldap/e-book-backend-ldap.c	13 Apr 2004 18:45:48 -0000
@@ -3234,6 +3234,15 @@
 		return GNOME_Evolution_Addressbook_OtherError;
 }
 
+static void
+e_book_backend_ldap_remove (EBookBackend *backend, EDataBook *book)
+{
+	/* if we ever add caching, we'll remove it here, but for now,
+	   just report back Success */
+
+	e_data_book_respond_remove (book, GNOME_Evolution_Addressbook_Success);
+}
+
 static char*
 e_book_backend_ldap_get_static_capabilities (EBookBackend *backend)
 {
@@ -3336,6 +3345,7 @@
 
 	/* Set the virtual methods. */
 	parent_class->load_source             = e_book_backend_ldap_load_source;
+	parent_class->remove                  = e_book_backend_ldap_remove;
 	parent_class->get_static_capabilities = e_book_backend_ldap_get_static_capabilities;
 
 	parent_class->create_contact          = e_book_backend_ldap_create_contact;