[evolution-couchdb] Some bonobo.server fixes

[Rodrigo Moya <rodrigo src gnome org>]

commit 1e94f86e34856e0b062924bee5d793ab6e86c4f6
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Jun 18 12:42:51 2009 +0200

    Some bonobo.server fixes

 addressbook/GNOME_Evolution_CouchDB.server.in |    2 +-
 addressbook/Makefile.am                       |    5 +++--
 addressbook/e-book-backend-couchdb.c          |    5 ++++-
 configure.ac                                  |    3 ---
 4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/addressbook/GNOME_Evolution_CouchDB.server.in b/addressbook/GNOME_Evolution_CouchDB.server.in
index 70dcfd2..fd6b007 100644
--- a/addressbook/GNOME_Evolution_CouchDB.server.in
+++ b/addressbook/GNOME_Evolution_CouchDB.server.in
@@ -2,7 +2,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_CouchDB_BookFactory:@EDS_API_VERSION@"
             type="shlib"
-            location="@EDS_EXTENSION_DIR@/libebookcouchdb.so">
+            location="@EDS_EXTENSION_DIR@/libebookbackendcouchdb.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/DataServer/BookFactory:@EDS_API_VERSION@"/>
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index be348c0..24967ad 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -15,10 +15,11 @@ libebookbackendcouchdb_la_LIBADD =		\
 
 #libebookbackendcouchdb_la_LDADD = -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.in
-	cp GNOME_Evolution_CouchDB.server.in $@
+GNOME_Evolution_CouchDB_$(EDS_API_VERSION).server: GNOME_Evolution_CouchDB.server
+	cp GNOME_Evolution_CouchDB.server $@
 
 EXTRA_DIST = GNOME_Evolution_CouchDB.server.in
 
diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
index ad2de39..bd0539a 100644
--- a/addressbook/e-book-backend-couchdb.c
+++ b/addressbook/e-book-backend-couchdb.c
@@ -99,7 +99,7 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 	uri = e_source_get_uri (source);
 	couchdb_backend->priv->dbname = g_strdup ("contacts");
 
-	if (! (couchdb_backend->priv->couchdb = couchdb_new (uri)))
+	if (! (couchdb_backend->priv->couchdb = couchdb_new (NULL /* FIXME: uri */)))
 		return GNOME_Evolution_Addressbook_OtherError;
 	g_free (uri);
 
@@ -151,6 +151,9 @@ e_book_backend_couchdb_create_contact (EBookBackend *backend,
 				       guint32 opid,
 				       const char *vcard)
 {
+	EBookBackendCouchDB *couchdb_backend = E_BOOK_BACKEND_COUCHDB (backend);
+
+	g_return_if_fail (E_IS_BOOK_BACKEND_COUCHDB (couchdb_backend));
 }
 
 static void
diff --git a/configure.ac b/configure.ac
index 74977f0..228f243 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,9 +46,6 @@ AC_SUBST(EDS_EXTENSION_DIR)
 EVOLUTION_PLUGINS_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin`
 AC_SUBST(EVOLUTION_PLUGINS_DIR)
 
-serverdir="$libdir/bonobo/servers"
-AC_SUBST(serverdir)
-
 dnl Makefiles
 AC_OUTPUT([
 Makefile