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/pas | |
| 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/pas')
| -rw-r--r-- | addressbook/backend/pas/pas-book-factory.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c index 626c7420e2..02dedbabe5 100644 --- a/addressbook/backend/pas/pas-book-factory.c +++ b/addressbook/backend/pas/pas-book-factory.c @@ -10,17 +10,12 @@ #include <config.h> #include <ctype.h> #include <gnome.h> +#include <liboaf/liboaf.h> #include "addressbook.h" #include "pas-book-factory.h" -#ifdef USING_OAF -#include <liboaf/liboaf.h> #define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" -#else -#include <libgnorba/gnorba.h> -#define PAS_BOOK_FACTORY_GOAD_ID "evolution:addressbook-server" -#endif static BonoboObjectClass *pas_book_factory_parent_class; POA_Evolution_BookFactory__vepv pas_book_factory_vepv; @@ -424,8 +419,6 @@ pas_book_factory_new (void) return factory; } -#ifdef USING_OAF - static gboolean register_factory (CORBA_Object obj) { @@ -451,43 +444,6 @@ register_factory (CORBA_Object obj) } } -#else - -static gboolean -register_factory (CORBA_Object obj) -{ - CORBA_Environment ev; - int ret; - - CORBA_exception_init (&ev); - ret = goad_server_register (NULL, obj, PAS_BOOK_FACTORY_GOAD_ID, "server", &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_message ("pas_book_factory_activate: Exception " - "registering PASBookFactory!\n"); - CORBA_exception_free (&ev); - return FALSE; - } - - CORBA_exception_free (&ev); - - switch (ret) { - case 0: - return TRUE; - case -2: - g_message ("pas_book_factory_activate: Another " - "PASBookFactory is already running.\n"); - return FALSE; - case -1: - default: - g_message ("pas_book_factory_activate: Error " - "registering PASBookFactory!\n"); - return FALSE; - } -} - -#endif - /** * pas_book_factory_activate: */ |