9 files changed, 14 insertions, 72 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 9c4e077705..dbc193f3ad 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2000-08-26  JP Rosevear  <jpr@helixcode.com>
+
+	* gui/Makefile.am: Remove gnorba stuff 
+
+	* gui/main.c: ditto
+
+	* gui/component-factory.c: ditto
+
+	* gui/control-factory.c: ditto
+
+	* gui/*.gnorba: ditto
+
 2000-08-25  JP Rosevear  <jpr@helixcode.com>
 
 	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment
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 <bonobo/bonobo-control.h>
 #include <glade/glade.h>
 
-#ifdef USING_OAF
 #include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
 
 #include <cal-util/timeutil.h>
 #include <gui/alarm.h>
@@ -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 <bonobo/bonobo-control.h>
 #include <glade/glade.h>
 
-#ifdef USING_OAF
 #include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
 
 #include <e-util/e-cursors.h>
 #include <cal-util/timeutil.h>
@@ -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"));