Merge lp:~rodrigo-moya/evolution-couchdb/use-esource-properties into lp:evolution-couchdb

[Rodrigo Moya]

[dobey (dobey)]

review: Approve

[lp:~rodrigo-moya/evolution-couchdb/use-esource-properties]

46. By Rodrigo Moya on 2009-08-01

Use 'error' correctly'

[Elliot Murphy (statik)]

review: Approve

=== modified file 'addressbook/e-book-backend-couchdb.c'
--- addressbook/e-book-backend-couchdb.c	2009-07-25 21:39:45 +0000
+++ addressbook/e-book-backend-couchdb.c	2009-07-31 15:49:02 +0000
@@ -24,6 +24,7 @@
 #include "e-book-backend-couchdb.h"
 #include <libedata-book/e-data-book.h>
 #include <libedata-book/e-data-book-view.h>
+#include <dbus/dbus-glib.h>
 
 G_DEFINE_TYPE (EBookBackendCouchDB, e_book_backend_couchdb, E_TYPE_BOOK_BACKEND);
 
@@ -164,7 +165,7 @@
 	GList *attr_list, *al;
 	const char *str;
 	CouchDBDocument *document;
-	EContactAddress *contact_address;
+	const EContactAddress *contact_address;
 
 	/* create the CouchDBDocument to put on the database */
 	document = couchdb_document_new (couchdb_backend->couchdb);
@@ -329,6 +330,7 @@
 				    gboolean only_if_exists)
 {
 	gchar *uri;
+	const gchar *property;
 	CouchDBDatabaseInfo *db_info;
 	GError *error = NULL;
 	EBookBackendCouchDB *couchdb_backend = E_BOOK_BACKEND_COUCHDB (backend);
@@ -341,11 +343,52 @@
 		g_free (couchdb_backend->dbname);
 
 	/* create CouchDB main object */
-	uri = e_source_get_uri (source);
 	couchdb_backend->dbname = g_strdup ("contacts");
 
-	if (! (couchdb_backend->couchdb = couchdb_new (NULL /* FIXME: uri */)))
+	property = e_source_get_property (source, "couchdb_instance");
+	if (g_strcmp0 (property, "user") == 0) {
+		DBusGConnection *bus;
+		DBusGProxy *proxy;
+		gint port;
+		gboolean success;
+
+		/* Get the port via the org.desktopcouch.CouchDB interface */
+		error = NULL;
+		bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+		if (&error) {
+			g_warning ("DBus error: %s", error->message);
+			g_error_free (error);
+			return GNOME_Evolution_Addressbook_NoSuchBook;
+		}
+
+		proxy = dbus_g_proxy_new_for_name (bus,
+						   "org.desktopcouch.CouchDB",
+						   "/",
+						   "org.desktopcouch.CouchDB");
+
+		error = NULL;
+		success = dbus_g_proxy_call (proxy, "getPort", &error, G_TYPE_INVALID,
+					     &port, G_TYPE_INVALID);
+
+		/* Free memory */
+		g_object_unref (G_OBJECT (proxy));
+		g_object_unref (G_OBJECT (bus));
+
+		if (success)
+			uri = g_strdup_printf ("http://localhost:%d", port);
+		else
+			return GNOME_Evolution_Addressbook_NoSuchBook;
+
+	} else if (g_strcmp0 (property, "remote") == 0)
+		uri = g_strdup_printf ("http://%s", e_source_get_property (source, "couchdb_remote_server"));
+	else
+		uri = g_strdup ("http://localhost:5984");
+
+	if (! (couchdb_backend->couchdb = couchdb_new (uri))) {
+		g_free (uri);
 		return GNOME_Evolution_Addressbook_OtherError;
+	}
+
 	g_free (uri);
 
 	/* check if only_if_exists */

=== modified file 'configure.ac'
--- configure.ac	2009-07-20 14:24:39 +0000
+++ configure.ac	2009-07-31 15:49:02 +0000
@@ -34,7 +34,7 @@
 AC_SUBST(localedir)
 
 dnl Check for dependencies
-PKG_CHECK_MODULES(EVOLUTION, glib-2.0 couchdb-glib-1.0 >= 0.2 libebook-1.2 libedata-book-1.2)
+PKG_CHECK_MODULES(EVOLUTION, glib-2.0 couchdb-glib-1.0 >= 0.2 libebook-1.2 libedata-book-1.2 dbus-glib-1)
 AC_SUBST(EVOLUTION_CFLAGS)
 AC_SUBST(EVOLUTION_LIBS)