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, 7 insertions, 7 deletions

diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
index 5b559940d1..a447d64851 100644
--- a/addressbook/backend/pas/pas-backend.c
+++ b/addressbook/backend/pas/pas-backend.c
@@ -448,8 +448,8 @@ pas_backend_change_add_new     (const char *vcard)
 {
 	GNOME_Evolution_Addressbook_BookChangeItem* new_change = GNOME_Evolution_Addressbook_BookChangeItem__alloc();
 
-	new_change->_d = GNOME_Evolution_Addressbook_ContactAdded;
-	new_change->_u.add_vcard = CORBA_string_dup (vcard);
+	new_change->changeType= GNOME_Evolution_Addressbook_ContactAdded;
+	new_change->vcard = CORBA_string_dup (vcard);
 
 	return new_change;
 }
@@ -459,19 +459,19 @@ pas_backend_change_modify_new  (const char *vcard)
 {
 	GNOME_Evolution_Addressbook_BookChangeItem* new_change = GNOME_Evolution_Addressbook_BookChangeItem__alloc();
 
-	new_change->_d = GNOME_Evolution_Addressbook_ContactModified;
-	new_change->_u.mod_vcard = CORBA_string_dup (vcard);
+	new_change->changeType= GNOME_Evolution_Addressbook_ContactModified;
+	new_change->vcard = CORBA_string_dup (vcard);
 
 	return new_change;
 }
 
 GNOME_Evolution_Addressbook_BookChangeItem*
-pas_backend_change_delete_new  (const char *id)
+pas_backend_change_delete_new  (const char *vcard)
 {
 	GNOME_Evolution_Addressbook_BookChangeItem* new_change = GNOME_Evolution_Addressbook_BookChangeItem__alloc();
 
-	new_change->_d = GNOME_Evolution_Addressbook_ContactDeleted;
-	new_change->_u.del_id = CORBA_string_dup (id);
+	new_change->changeType= GNOME_Evolution_Addressbook_ContactDeleted;
+	new_change->vcard = CORBA_string_dup (vcard);
 
 	return new_change;
 }