+ * addressbook/backend/pas/pas-book-factory.c

+	(PAS_BOOK_FACTORY_GOAD_ID): changed to
+	"evolution:addressbook-server".
+
+	* addressbook/backend/pas/Makefile.am: no need to install a
+	.gnorba file from here, as the wombat.gnorba file in
+	evolution/wombat will do its job.
+
+	* addressbook/backend/ebook/test-client.c (ebook_create): if
+	ebook_new fails, print a warning and return.
+
+	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
+	to "evolution:addressbook-server".

The wombat in evolution/wombat will now have both the pcs and the pas
in it.

svn path=/trunk/; revision=2246

2 files changed, 9 insertions, 1 deletions

diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index e95ff8f751..ffbf0e78fb 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -18,7 +18,7 @@
 
 GtkObjectClass *e_book_parent_class;
 
-#define CARDSERVER_GOAD_ID "evolution:card-server"
+#define CARDSERVER_GOAD_ID "evolution:addressbook-server"
 
 typedef enum {
 	URINotLoaded,
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index b99ebdae5e..3091fede1d 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -102,6 +102,14 @@ ebook_create (void)
 	
 	book = e_book_new ();
 
+	if (!book) {
+		printf ("%s: %s: Couldn't create EBook, bailing.\n",
+			__FILE__,
+			__FUNCTION__);
+		return FALSE;
+	}
+	
+
 	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
 		printf ("error calling load_uri!\n");
 	}