[evolution-couchdb] Adapt to Couchdb -> CouchdbSession renaming

[Rodrigo Moya <rodrigo src gnome org>]

commit f650b11f48b36ff034b1c712c3dcbb23bd6ffc19
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Jan 11 18:06:17 2010 +0100

    Adapt to Couchdb -> CouchdbSession renaming

 addressbook/e-book-backend-couchdb.c |   46 +++++++++++++++++-----------------
 addressbook/e-book-backend-couchdb.h |    2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
index 55eafd0..ca3b1f1 100644
--- a/addressbook/e-book-backend-couchdb.c
+++ b/addressbook/e-book-backend-couchdb.c
@@ -854,7 +854,7 @@ couch_document_from_contact (EBookBackendCouchDB *couchdb_backend, EContact *con
 }
 
 static void
-document_updated_cb (Couchdb *couchdb, const char *dbname, CouchdbDocument *document, gpointer user_data)
+document_updated_cb (CouchdbSession *couchdb, const char *dbname, CouchdbDocument *document, gpointer user_data)
 {
 	char *vcard;
 	EContact *contact;
@@ -877,7 +877,7 @@ document_updated_cb (Couchdb *couchdb, const char *dbname, CouchdbDocument *docu
 }
 
 static void
-document_deleted_cb (Couchdb *couchdb, const char *dbname, const char *docid, gpointer user_data)
+document_deleted_cb (CouchdbSession *couchdb, const char *dbname, const char *docid, gpointer user_data)
 {
 	EBookBackendCouchDB *couchdb_backend = E_BOOK_BACKEND_COUCHDB (user_data);
 
@@ -991,17 +991,17 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 	else
 		uri = g_strdup ("http://127.0.0.1:5984";);
 
-	if (! (couchdb_backend->couchdb = couchdb_new (uri))) {
+	if (! (couchdb_backend->couchdb = couchdb_session_new (uri))) {
 		g_free (uri);
 		return GNOME_Evolution_Addressbook_OtherError;
 	}
 
 	if (enable_oauth) {
-		couchdb_enable_oauth (couchdb_backend->couchdb,
-				      oauth_c_key,
-				      oauth_c_secret,
-				      oauth_t_key,
-				      oauth_t_secret);
+		couchdb_session_enable_oauth (couchdb_backend->couchdb,
+					      oauth_c_key,
+					      oauth_c_secret,
+					      oauth_t_key,
+					      oauth_t_secret);
 
 		g_free (oauth_c_key);
 		g_free (oauth_c_secret);
@@ -1013,9 +1013,9 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 
 	/* check if only_if_exists */
 	error = NULL;
-	db_info = couchdb_get_database_info (couchdb_backend->couchdb,
-					     couchdb_backend->dbname,
-					     &error);
+	db_info = couchdb_session_get_database_info (couchdb_backend->couchdb,
+						     couchdb_backend->dbname,
+						     &error);
 	if (!db_info) {
 		if (error) {
 			g_warning ("Could not get CouchDB database info: %s", error->message);
@@ -1027,9 +1027,9 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 		
 		/* if it does not exist, create it */
 		error = NULL;
-		if (!couchdb_create_database (couchdb_backend->couchdb,
-					      couchdb_backend->dbname,
-					      &error)) {
+		if (!couchdb_session_create_database (couchdb_backend->couchdb,
+						      couchdb_backend->dbname,
+						      &error)) {
 			g_warning ("Could not create 'contacts' database: %s", error->message);
 			g_error_free (error);
 
@@ -1048,7 +1048,7 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 			  G_CALLBACK (document_updated_cb), couchdb_backend);
 	g_signal_connect (G_OBJECT (couchdb_backend->couchdb), "document_deleted",
 			  G_CALLBACK (document_deleted_cb), couchdb_backend);
-	couchdb_listen_for_changes (couchdb_backend->couchdb, couchdb_backend->dbname);
+	couchdb_session_listen_for_changes (couchdb_backend->couchdb, couchdb_backend->dbname);
 
 	return GNOME_Evolution_Addressbook_Success;
 }
@@ -1297,9 +1297,9 @@ e_book_backend_couchdb_get_contact_list (EBookBackend *backend,
 	}
 
 	/* Get the list of documents from CouchDB */
-	doc_list = couchdb_list_documents (couchdb_backend->couchdb,
-					   couchdb_backend->dbname,
-					   &error);
+	doc_list = couchdb_session_list_documents (couchdb_backend->couchdb,
+						   couchdb_backend->dbname,
+						   &error);
 	for (sl = doc_list; sl != NULL; sl = sl->next) {
 		char *vcard;
 		CouchdbDocument *document;
@@ -1326,7 +1326,7 @@ e_book_backend_couchdb_get_contact_list (EBookBackend *backend,
 	}
 
 	g_object_unref (card_sexp);
-	couchdb_free_document_list (doc_list);
+	couchdb_session_free_document_list (doc_list);
 
 	e_data_book_respond_get_contact_list (book, opid, GNOME_Evolution_Addressbook_Success, contacts);
 }
@@ -1344,9 +1344,9 @@ e_book_backend_couchdb_start_book_view (EBookBackend *backend,
 	sexp = e_data_book_view_get_card_sexp  (book_view);
 
 	/* Get the list of documents from CouchDB */
-	doc_list = couchdb_list_documents (couchdb_backend->couchdb,
-					   couchdb_backend->dbname,
-					   &error);
+	doc_list = couchdb_session_list_documents (couchdb_backend->couchdb,
+						   couchdb_backend->dbname,
+						   &error);
 	for (sl = doc_list; sl != NULL; sl = sl->next) {
 		CouchdbDocument *document;
 		char *vcard;
@@ -1373,7 +1373,7 @@ e_book_backend_couchdb_start_book_view (EBookBackend *backend,
 		g_object_unref (G_OBJECT (document));
 	}
 
-	couchdb_free_document_list (doc_list);
+	couchdb_session_free_document_list (doc_list);
 	e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
 }
 
diff --git a/addressbook/e-book-backend-couchdb.h b/addressbook/e-book-backend-couchdb.h
index 9e65fcd..78296ac 100644
--- a/addressbook/e-book-backend-couchdb.h
+++ b/addressbook/e-book-backend-couchdb.h
@@ -37,7 +37,7 @@
 typedef struct {
 	EBookBackend parent_object;
 
-	Couchdb *couchdb;
+	CouchdbSession *couchdb;
 	char *dbname;
 	gboolean using_desktopcouch;
 } EBookBackendCouchDB;