make it work with the new ebook api

003-10-21  JP Rosevear <jpr@ximian.com>

 	* conduit/address-conduit.c: make it work with the new ebook api

 	* backend/pas/pas-book.c (pas_book_respond_get_changes): put the
 	vcard in for every change

 	* backend/pas/pas-backend.c (pas_backend_change_add_new): just use
 	the vcard field
 	(pas_backend_change_modify_new): ditto
 	(pas_backend_change_delete_new): ditto

 	* backend/pas/pas-backend-file.c
 	(pas_backend_file_changes_foreach_key): create a fake contact with
 	the uid
 	(pas_backend_file_get_changes): add the card to the changes

 	* backend/ebook/tests/ebook/test-changes.c (main): just print the
 	uid

 	* backend/ebook/e-book.c (e_book_free_change_list): unref the
 	contact

 	* backend/ebook/e-book-types.h: the change struct contains an
 	EContact now

 	* backend/ebook/e-book-listener.c
 	(impl_BookListener_respond_get_changes): create the contact from
 	the vcard string

 	* backend/idl/addressbook.idl: Book change item is no longer a
 	union, it always gives back a card

svn path=/trunk/; revision=23031

1 files changed, 2 insertions, 4 deletions

diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index 0bb5193376..f3a7de266c 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -187,20 +187,18 @@ impl_BookListener_respond_get_changes (PortableServer_Servant servant,
 		EBookChange *change = g_new (EBookChange, 1);
 		GNOME_Evolution_Addressbook_BookChangeItem corba_change = changes->_buffer[i];
 
-		switch (corba_change._d) {
+		switch (corba_change.changeType) {
 		case GNOME_Evolution_Addressbook_ContactAdded:
 			change->change_type = E_BOOK_CHANGE_CARD_ADDED;
-			change->vcard = g_strdup (corba_change._u.add_vcard);
 			break;
 		case GNOME_Evolution_Addressbook_ContactDeleted:
 			change->change_type = E_BOOK_CHANGE_CARD_DELETED;
-			change->id = g_strdup (corba_change._u.del_id);
 			break;
 		case GNOME_Evolution_Addressbook_ContactModified:
 			change->change_type = E_BOOK_CHANGE_CARD_MODIFIED;
-			change->vcard = g_strdup (corba_change._u.mod_vcard);
 			break;
 		}
+		change->contact = e_contact_new_from_vcard (corba_change.vcard);
 
 		response.list = g_list_prepend (response.list, change);
 	}