diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-08-30 02:13:21 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-08-30 02:13:21 +0800 |
| commit | 3ad97477c9110a8cfd8e9641f84c8984abf33be5 (patch) | |
| tree | 0bacc110535936967cc8b0b44fbb2625d4d344dc /addressbook/backend/ebook/e-book.c | |
| parent | e02a9171c4acc0d0884c32ad6b9119663b0d9bf2 (diff) | |
| download | gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.gz gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.bz2 gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.lz gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.xz gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.zst gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.zip | |
Remove USING_OAF checks
svn path=/trunk/; revision=5099
Diffstat (limited to 'addressbook/backend/ebook/e-book.c')
| -rw-r--r-- | addressbook/backend/ebook/e-book.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c index 38179559ba..2023f1bf83 100644 --- a/addressbook/backend/ebook/e-book.c +++ b/addressbook/backend/ebook/e-book.c @@ -11,6 +11,7 @@ #include <config.h> #include <gtk/gtksignal.h> #include <gtk/gtkmarshal.h> +#include <liboaf/liboaf.h> #include "addressbook.h" #include "e-card-cursor.h" @@ -19,13 +20,7 @@ GtkObjectClass *e_book_parent_class; -#ifdef USING_OAF -#include <liboaf/liboaf.h> #define CARDSERVER_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" -#else -#include <libgnorba/gnorba.h> -#define CARDSERVER_GOAD_ID "evolution:addressbook-server" -#endif typedef enum { URINotLoaded, @@ -450,14 +445,8 @@ e_book_construct (EBook *book) * Connect to the Personal Addressbook Server. */ -#ifdef USING_OAF book->priv->book_factory = (Evolution_BookFactory) oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL); -#else - book->priv->book_factory = (Evolution_BookFactory) - goad_server_activate_with_id (NULL, CARDSERVER_GOAD_ID, 0, NULL); -#endif - if (book->priv->book_factory == CORBA_OBJECT_NIL) { g_warning ("e_book_construct: Could not obtain a handle " "to the Personal Addressbook Server!\n"); |