From 52b965f43ff11d75aac2494e8c8c677dfbd7cb2a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Sat, 26 Aug 2000 05:46:47 +0000 Subject: Remove gnorba stuff 2000-08-26 JP Rosevear * gui/Makefile.am: Remove gnorba stuff * gui/main.c: ditto * gui/component-factory.c: ditto * gui/control-factory.c: ditto * gui/*.gnorba: ditto svn path=/trunk/; revision=5048 --- calendar/gui/Makefile.am | 11 ++--------- calendar/gui/calendar-component.c | 4 ---- calendar/gui/calendar-control.gnorba | 11 ----------- calendar/gui/component-factory.c | 4 ---- calendar/gui/control-factory.c | 8 -------- calendar/gui/evolution-calendar.gnorba | 11 ----------- calendar/gui/gnomecal.gnorba | 11 ----------- calendar/gui/main.c | 14 -------------- 8 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 calendar/gui/calendar-control.gnorba delete mode 100644 calendar/gui/evolution-calendar.gnorba delete mode 100644 calendar/gui/gnomecal.gnorba (limited to 'calendar/gui') diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 4927f7c6b6..ae66b3f442 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -99,17 +99,10 @@ evolution_calendar_LDADD = \ evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf` -if USING_OAF oafdir = $(datadir)/oaf oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo -else -gnorbadir = $(sysconfdir)/CORBA/servers -gnorba_DATA = calendar-control.gnorba evolution-calendar.gnorba -endif -OAF_GNORBA_EXTRAS = calendar-control.oafinfo evolution-calendar.oafinfo calendar-control.gnorba evolution-calendar.gnorba EXTRA_DIST = \ - $(OAF_GNORBA_EXTRAS) \ $(glade_DATA) \ bell.xpm \ dayview.xpm \ @@ -123,8 +116,8 @@ EXTRA_DIST = \ weekview.xpm \ workweekview.xpm \ yearview.xpm \ - calendar-control.gnorba \ - calendar-control.oafinfo + calendar-control.oafinfo \ + evolution-calendar.oafinfo install-data-local: diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 8644b8928c..fce8512725 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -29,11 +29,7 @@ -#ifdef USING_OAF #define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" -#else -#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:evolution-calendar" -#endif static BonoboGenericFactory *factory = NULL; diff --git a/calendar/gui/calendar-control.gnorba b/calendar/gui/calendar-control.gnorba deleted file mode 100644 index ed504d8f5b..0000000000 --- a/calendar/gui/calendar-control.gnorba +++ /dev/null @@ -1,11 +0,0 @@ -[control-factory:calendar] -type=exe -repo_id=IDL:Bonobo/GenericFactory:1.0 -description=Factory for the sample Calendar control -location_info=evolution-calendar - -[control:calendar] -type=factory -repo_id=IDL:BonoboControl/calendar-control:1.0 IDL:Bonobo/Control:1.0 -description=A sample Bonobo control which displays an calendar. -location_info=control-factory:calendar diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index 8644b8928c..fce8512725 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -29,11 +29,7 @@ -#ifdef USING_OAF #define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" -#else -#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:evolution-calendar" -#endif static BonoboGenericFactory *factory = NULL; diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index d7626d21f3..7bdd9b52a5 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -28,11 +28,7 @@ #include #include -#ifdef USING_OAF #include -#else -#include -#endif #include #include @@ -45,11 +41,7 @@ #define PROPERTY_CALENDAR_URI_IDX 1 -#ifdef USING_OAF #define CONTROL_FACTORY_ID "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc" -#else -#define CONTROL_FACTORY_ID "control-factory:calendar" -#endif CORBA_Environment ev; diff --git a/calendar/gui/evolution-calendar.gnorba b/calendar/gui/evolution-calendar.gnorba deleted file mode 100644 index e2f1107926..0000000000 --- a/calendar/gui/evolution-calendar.gnorba +++ /dev/null @@ -1,11 +0,0 @@ -[evolution-shell-component-factory:evolution-calendar] -type=exe -repo_id=IDL:Bonobo/GenericFactory:1.0 -description=Factory for the Evolution calendar component. -location_info=evolution-calendar - -[evolution-shell-component:evolution-calendar] -type=factory -repo_id=IDL:Evolution/ShellComponent:1.0 -description=Evolution component for handling the calendar. -location_info=evolution-shell-component-factory:evolution-calendar diff --git a/calendar/gui/gnomecal.gnorba b/calendar/gui/gnomecal.gnorba deleted file mode 100644 index 74df8ecf04..0000000000 --- a/calendar/gui/gnomecal.gnorba +++ /dev/null @@ -1,11 +0,0 @@ -[IDL:GNOME:Calendar:Repository:1.0] -type=factory -repo_id=IDL:Gnome/Calendar/Repository:1.0 -description=Calendar Repository -location_info=IDL:GNOME:Calendar:RepositoryLocator:1.0 - -[IDL:GNOME:Calendar:RepositoryLocator:1.0] -type=exe -repo_id=IDL:GNOME/GenericFactory:1.0 -description=Calendar Server -location_info=gnomecal diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 07d362df73..63bca2c9f2 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -31,11 +31,7 @@ #include #include -#ifdef USING_OAF #include -#else -#include -#endif #include #include @@ -49,21 +45,11 @@ static void init_bonobo (int *argc, char **argv) { -#ifdef USING_OAF /* FIXME: VERSION instead of "0.0". */ gnome_init_with_popt_table ("evolution-calendar", "0.0", *argc, argv, oaf_popt_options, 0, NULL); oaf_init (*argc, argv); -#else - CORBA_Environment ev; - - CORBA_exception_init (&ev); - gnome_CORBA_init_with_popt_table ( - "evolution-calendar", "0.0", - argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev); - CORBA_exception_free (&ev); -#endif if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) g_error (_("Could not initialize Bonobo")); -- cgit v1.2.3