Reorganized the shell to allow dynamic registration of storages and

folder types, and changed all the components to work with the new
setup.

svn path=/trunk/; revision=3199

1 files changed, 11 insertions, 13 deletions

diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c
index 9f8760fd3f..90b4f26cd4 100644
--- a/calendar/gui/evolution-calendar-control.c
+++ b/calendar/gui/evolution-calendar-control.c
@@ -24,9 +24,9 @@
 #define PROPERTY_CALENDAR_URI_IDX 1
 
 #ifdef USING_OAF
-#define CONTROL_FACTORY_ID "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
+#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
 #else
-#define CONTROL_FACTORY_ID "control-factory:calendar"
+#define CONTROL_FACTORY_ID   "control-factory:calendar"
 #endif
 
 CORBA_Environment ev;
@@ -138,7 +138,7 @@ calendar_properties_init (GnomeCalendar *gcal)
 
 
 static BonoboObject *
-calendar_factory (BonoboGenericFactory *Factory, void *closure)
+calendar_control_factory (BonoboGenericFactory *Factory, void *closure)
 {
 	BonoboControl *control;
 
@@ -160,22 +160,19 @@ calendar_factory (BonoboGenericFactory *Factory, void *closure)
 
 
 static void
-calendar_factory_init (void)
+calendar_control_factory_init (void)
 {
-	static BonoboGenericFactory *calendar_control_factory = NULL;
+	static BonoboGenericFactory *factory = NULL;
 
-	if (calendar_control_factory != NULL)
+	if (factory != NULL)
 		return;
 
 	puts ("XXXXXX - initializing calendar factory!!!");
 
-	calendar_control_factory =
-		bonobo_generic_factory_new (CONTROL_FACTORY_ID,
-					    calendar_factory, NULL);
+	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, calendar_control_factory, NULL);
 
-	if (calendar_control_factory == NULL) {
-		g_error ("I could not register a Calendar factory.");
-	}
+	if (factory == NULL)
+		g_error ("I could not register a Calendar control factory.");
 }
 
 
@@ -195,7 +192,8 @@ main (int argc, char **argv)
 
 	CORBA_exception_init (&ev);
 
-	calendar_factory_init ();
+	calendar_control_factory_init ();
+	component_factory_init ();
 
 	bonobo_main ();