[evolution-couchdb] Remove unneeded .server file from install and pass NULL UUIDs to all contacts fields so that they ge

[Rodrigo Moya <rodrigo src gnome org>]

commit 5d403a0cc245e627fcdb5614bccfcb9b2c4b5ab8
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Aug 5 14:05:18 2009 +0200

    Remove unneeded .server file from install and pass NULL UUIDs to all contacts fields so that they get generated

 addressbook/Makefile.am              |   14 ++------------
 addressbook/e-book-backend-couchdb.c |   18 ++++++++++--------
 2 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 1299fd4..9f4caf3 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES =				\
-	$(EVOLUTION_CFLAGS)		\
+INCLUDES =						\
+	$(EVOLUTION_CFLAGS)				\
 	-I$(top_srcdir)
 
 extensiondir = $(EDS_EXTENSION_DIR)
@@ -14,13 +14,3 @@ libebookbackendcouchdb_la_LIBADD =		\
 	$(EVOLUTION_LIBS)
 
 libebookbackendcouchdb_la_LDFLAGS = -module -avoid-version
-
-serverdir="$(libdir)/bonobo/servers"
-server_DATA = GNOME_Evolution_CouchDB_$(EDS_API_VERSION).server
-
-GNOME_Evolution_CouchDB_$(EDS_API_VERSION).server: GNOME_Evolution_CouchDB.server
-	cp GNOME_Evolution_CouchDB.server $@
-
-EXTRA_DIST = GNOME_Evolution_CouchDB.server.in
-
-CLEANFILES = GNOME_Evolution_CouchDB_$(EDS_API_VERSION).server
diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
index ecdc5f1..902d556 100644
--- a/addressbook/e-book-backend-couchdb.c
+++ b/addressbook/e-book-backend-couchdb.c
@@ -216,7 +216,7 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 				}
 			}
 
-			sf = couchdb_document_contact_email_new (email, description);
+			sf = couchdb_document_contact_email_new (/* FIXME */ NULL, email, description);
 			list = g_slist_append (list, sf);
 		}
 	}
@@ -234,7 +234,7 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 	if (str) {
 		CouchDBStructField *sf;
 
-		sf = couchdb_document_contact_phone_new (str, "home", /* FIXME */ 0);
+		sf = couchdb_document_contact_phone_new (/* FIXME */ NULL, str, "home", /* FIXME */ 0);
 		list = g_slist_append (list, sf);
 	}
 
@@ -242,7 +242,7 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 	if (str) {
 		CouchDBStructField *sf;
 
-		sf = couchdb_document_contact_phone_new (str, "work", /* FIXME */ 0);
+		sf = couchdb_document_contact_phone_new (/* FIXME */ NULL, str, "work", /* FIXME */ 0);
 		list = g_slist_append (list, sf);
 	}
 
@@ -250,7 +250,7 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 	if (str) {
 		CouchDBStructField *sf;
 
-		sf = couchdb_document_contact_phone_new (str, "other", /* FIXME */ 0);
+		sf = couchdb_document_contact_phone_new (/* FIXME */ NULL, str, "other", /* FIXME */ 0);
 		list = g_slist_append (list, sf);
 	}
 
@@ -267,7 +267,8 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 	if (contact_address) {
 		CouchDBStructField *sf;
 
-		sf = couchdb_document_contact_address_new (contact_address->street,
+		sf = couchdb_document_contact_address_new (/* FIXME */ NULL,
+							   contact_address->street,
 							   contact_address->locality,
 							   contact_address->region,
 							   contact_address->country,
@@ -281,7 +282,8 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 	if (contact_address) {
 		CouchDBStructField *sf;
 
-		sf = couchdb_document_contact_address_new (contact_address->street,
+		sf = couchdb_document_contact_address_new (/* FIXME */ NULL,
+							   contact_address->street,
 							   contact_address->locality,
 							   contact_address->region,
 							   contact_address->country,
@@ -295,7 +297,8 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 	if (contact_address) {
 		CouchDBStructField *sf;
 
-		sf = couchdb_document_contact_address_new (contact_address->street,
+		sf = couchdb_document_contact_address_new (/* FIXME */ NULL,
+							   contact_address->street,
 							   contact_address->locality,
 							   contact_address->region,
 							   contact_address->country,
@@ -372,7 +375,6 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 
 		/* Free memory */
 		g_object_unref (G_OBJECT (proxy));
-		g_object_unref (G_OBJECT (bus));
 
 		if (success)
 			uri = g_strdup_printf ("http://localhost:%d";, port);