diff options
| author | Matthew Loper <mloper@src.gnome.org> | 2000-03-30 02:48:28 +0800 |
|---|---|---|
| committer | Matthew Loper <mloper@src.gnome.org> | 2000-03-30 02:48:28 +0800 |
| commit | 6f86cf7638d512c0f1953e889bdfee60a45cd0c9 (patch) | |
| tree | 5e44112be7c0f5454f467346cbbe8285492e1440 /addressbook | |
| parent | 268aa743d50b496703eecd9c217879cde199380c (diff) | |
| download | gsoc2013-evolution-6f86cf7638d512c0f1953e889bdfee60a45cd0c9.tar.gz gsoc2013-evolution-6f86cf7638d512c0f1953e889bdfee60a45cd0c9.tar.zst gsoc2013-evolution-6f86cf7638d512c0f1953e889bdfee60a45cd0c9.zip | |
+ * 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
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/backend/ebook/e-book.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/test-client.c | 8 | ||||
| -rw-r--r-- | addressbook/backend/pas/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-book-factory.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/pas/wombat.gnorba | 5 |
5 files changed, 10 insertions, 11 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"); } 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 |