aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--addressbook/backend/ebook/e-book.c2
-rw-r--r--addressbook/backend/ebook/test-client.c8
-rw-r--r--addressbook/backend/pas/Makefile.am4
-rw-r--r--addressbook/backend/pas/pas-book-factory.c2
-rw-r--r--addressbook/backend/pas/wombat.gnorba5
6 files changed, 24 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index eb3394cad6..820f90563e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2000-03-29 Matt Loper <matt@helixcode.com>
+ * 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".
+
* wombat/wombat.c: Changed headerfile path.
* wombat/Makefile.am: Use relative paths to libraries in the build
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");
}
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 20b2d85531..3d3dd6f082 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -66,9 +66,5 @@ wombat_LDADD = \
-lbonobo \
$(pas_libs)
-gnorbadir = $(sysconfdir)/CORBA/servers
-gnorba_DATA = wombat.gnorba
-
BUILT_SOURCES = $(CORBA_SOURCE)
CLEANFILES += $(BUILT_SOURCES)
-EXTRA_DIST = $(gnorba_DATA) \ No newline at end of file
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index d200cf7114..576b28b0f5 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -11,7 +11,7 @@
#include <addressbook.h>
#include <pas-book-factory.h>
-#define PAS_BOOK_FACTORY_GOAD_ID "evolution:card-server"
+#define PAS_BOOK_FACTORY_GOAD_ID "evolution:addressbook-server"
static BonoboObjectClass *pas_book_factory_parent_class;
POA_Evolution_BookFactory__vepv pas_book_factory_vepv;
diff --git a/addressbook/backend/pas/wombat.gnorba b/addressbook/backend/pas/wombat.gnorba
deleted file mode 100644
index f45ecb3158..0000000000
--- a/addressbook/backend/pas/wombat.gnorba
+++ /dev/null
@@ -1,5 +0,0 @@
-[evolution:card-server]
-type=exe
-repo_id=IDL:Evolution/CardServer:1.0
-description=The Personal Addressbook Server
-location_info=wombat