diff options
| -rw-r--r-- | addressbook/ChangeLog | 11 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 5 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-factory.c | 24 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/minicard/e-minicard-control.c | 7 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-control.c | 7 |
6 files changed, 13 insertions, 45 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 57d53475b0..78cc0f43c6 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,14 @@ +2000-08-26 JP Rosevear <jpr@helixcode.com> + + * gui/component/addressbook-component.c: Remove gnorba stuff + + * gui/minicard/e-minicard-control.c (e_minicard_control_factory_init): + ditto + + * gui/component/addressbook.c: ditto + + * gui/component/addressbook-factory.c: ditto + 2000-08-25 Christopher James Lahey <clahey@helixcode.com> * demo/* Removed the demo directory since it's no longer used. diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 4a73821630..5b52b8337b 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -35,11 +35,8 @@ #include "e-ldap-storage.h" -#ifdef USING_OAF + #define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0" -#else -#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:addressbook" -#endif /* Nasty hack for filters to be able to find folders */ /* Not even used with addressbook??? */ diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c index 7b939318fb..9ee420e851 100644 --- a/addressbook/gui/component/addressbook-factory.c +++ b/addressbook/gui/component/addressbook-factory.c @@ -11,6 +11,7 @@ #include <config.h> #include <gnome.h> #include <bonobo.h> +#include <liboaf/liboaf.h> #include <glade/glade.h> #include <e-util/e-cursors.h> @@ -19,9 +20,6 @@ #include "addressbook/gui/minicard/e-minicard-control.h" #include "select-names/e-select-names-factory.h" -#ifdef USING_OAF - -#include <liboaf/liboaf.h> static void init_corba (int *argc, char **argv) @@ -32,26 +30,6 @@ init_corba (int *argc, char **argv) oaf_init (*argc, argv); } -#else - -#include <libgnorba/gnorba.h> - -static void -init_corba (int *argc, char **argv) -{ - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - gnome_CORBA_init_with_popt_table ( - "evolution-addressbook", "0.0", - argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev); - - CORBA_exception_free (&ev); -} - -#endif - static void init_bonobo (int argc, char **argv) { diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 12f9dbf9e0..54ae5bcdad 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -41,11 +41,7 @@ #include <addressbook/printing/e-contact-print.h> -#ifdef USING_OAF #define CONTROL_FACTORY_ID "OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17" -#else -#define CONTROL_FACTORY_ID "control-factory:addressbook" -#endif #define PROPERTY_FOLDER_URI "folder_uri" diff --git a/addressbook/gui/minicard/e-minicard-control.c b/addressbook/gui/minicard/e-minicard-control.c index d6dd70656d..a5d2038a8a 100644 --- a/addressbook/gui/minicard/e-minicard-control.c +++ b/addressbook/gui/minicard/e-minicard-control.c @@ -321,17 +321,10 @@ e_minicard_control_factory_init (void) if (factory != NULL) return; -#if USING_OAF factory = bonobo_generic_factory_new ( "OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595", e_minicard_control_factory, NULL); -#else - factory = - bonobo_generic_factory_new ( - "control-factory:e-minicard", - e_minicard_control_factory, NULL); -#endif if (factory == NULL) g_error ("I could not register a EMinicard control factory."); diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index d6dd70656d..a5d2038a8a 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -321,17 +321,10 @@ e_minicard_control_factory_init (void) if (factory != NULL) return; -#if USING_OAF factory = bonobo_generic_factory_new ( "OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595", e_minicard_control_factory, NULL); -#else - factory = - bonobo_generic_factory_new ( - "control-factory:e-minicard", - e_minicard_control_factory, NULL); -#endif if (factory == NULL) g_error ("I could not register a EMinicard control factory."); |