[evolution-couchdb] Add better error reporting from DBus calls



commit d1fb6edd17c04c068784c06b290b1e4eae09794d
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Tue Aug 18 00:30:09 2009 +0200

    Add better error reporting from DBus calls

 addressbook/e-book-backend-couchdb.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
index 76f56db..bc73a0f 100644
--- a/addressbook/e-book-backend-couchdb.c
+++ b/addressbook/e-book-backend-couchdb.c
@@ -540,8 +540,9 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 		error = NULL;
 		bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 		if (error) {
-			g_warning ("DBus error: %s", error->message);
+			g_warning ("Couldn't get session bus: %s", error->message);
 			g_error_free (error);
+
 			return GNOME_Evolution_Addressbook_NoSuchBook;
 		}
 
@@ -560,8 +561,12 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 
 		if (success)
 			uri = g_strdup_printf ("http://localhost:%d";, port);
-		else
+		else {
+			g_warning ("Couldn't get port for desktopcouch: %s", error->message);
+			g_error_free (error);
+
 			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"));
@@ -576,10 +581,18 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
 	g_free (uri);
 
 	/* check if only_if_exists */
+	error = NULL;
 	db_info = couchdb_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);
+			g_error_free (error);
+
+			return GNOME_Evolution_Addressbook_NoSuchBook;
+		}
+
 		if (only_if_exists)
 			return GNOME_Evolution_Addressbook_NoSuchBook;
 		



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]