diff options
Diffstat (limited to 'calendar/gui/main.c')
| -rw-r--r-- | calendar/gui/main.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/calendar/gui/main.c b/calendar/gui/main.c index b9b504826b..b74b1040cd 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -34,7 +34,6 @@ #include <liboaf/liboaf.h> #include <bonobo/bonobo-main.h> #include <bonobo/bonobo-generic-factory.h> -#include <bonobo/bonobo-exception.h> #include <gal/widgets/e-cursors.h> @@ -42,18 +41,14 @@ #include "calendar-commands.h" #include "calendar-config.h" #include "component-factory.h" -#include "e-comp-editor-registry.h" #include "comp-editor-factory.h" #include "control-factory.h" #include "itip-control-factory.h" #include "tasks-control-factory.h" -ECompEditorRegistry *comp_editor_registry = NULL; - /* The component editor factory */ static CompEditorFactory *comp_editor_factory = NULL; - static void init_bonobo (int argc, char **argv) { @@ -108,7 +103,7 @@ launch_alarm_daemon (void) CORBA_exception_init (&ev); an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev); - if (BONOBO_EX (&ev)) { + if (ev._major != CORBA_NO_EXCEPTION) { g_message ("add_alarms(): Could not activate the alarm notification service"); CORBA_exception_free (&ev); return; @@ -119,7 +114,7 @@ launch_alarm_daemon (void) CORBA_exception_init (&ev); bonobo_object_release_unref (an, &ev); - if (BONOBO_EX (&ev)) + if (ev._major != CORBA_NO_EXCEPTION) g_message ("add_alarms(): Could not unref the alarm notification service"); CORBA_exception_free (&ev); @@ -148,8 +143,6 @@ main (int argc, char **argv) G_LOG_LEVEL_WARNING); #endif - comp_editor_registry = E_COMP_EDITOR_REGISTRY (e_comp_editor_registry_new ()); - calendar_config_init (); control_factory_init (); |