Removed. Removed.

* gui/config-control-factory.h: Removed.
* gui/config-control-factory.c: Removed.

* gui/itip-bonobo-control.c: Renamed from itip-control-factory.c.
(itip_bonobo_control_new): New.
(itip_control_factory_init): Removed.

* gui/itip-bonobo-control.h: Renamed from itip-control-factory.h.

* gui/tasks-control-factory.c: Removed.
* gui/tasks-control-factory.h: Removed.

* gui/control-factory.c (control_factory_init): Removed.

* gui/Makefile.am: Updated to build everything as
libevolution-calendar.so and install in the COMPONENTDIR.

* gui/GNOME_Evolution_Calendar.server.in.in: Updated to build the
component as a shared library.

* gui/main.c (main): Removed.

* gui/calendar-component.c (calendar_component_get_object): New.
(owner_set_cb): Do not store the shell pointer in shells.
(owner_unset_cb): Do not remove the shell pointer from shells;
instead, just set global_shell_client to NULL.

* gui/calendar-component.h: Renamed from component-factory.h.
* gui/calendar-component.c: Renamed from component-factory.c.

svn path=/trunk/; revision=19430

1 files changed, 5 insertions, 23 deletions

diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index 56f362d6e3..2906046a39 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -34,7 +34,7 @@
 #include <ical.h>
 
 #include "e-itip-control.h"
-#include "itip-control-factory.h"
+#include "itip-bonobo-control.h"
 
 extern gchar *evolution_dir;
 
@@ -195,10 +195,10 @@ set_prop ( BonoboPropertyBag *bag,
 }
 
 
-static BonoboObject *
-itip_control_factory (BonoboGenericFactory *Factory, void *closure)
+BonoboControl *
+itip_bonobo_control_new (void)
 {
-	BonoboControl      *control;
+	BonoboControl *control;
 	BonoboPropertyBag *prop_bag;
 	BonoboPersistStream *stream;
 	GtkWidget *itip;
@@ -230,23 +230,5 @@ itip_control_factory (BonoboGenericFactory *Factory, void *closure)
 	bonobo_object_add_interface (BONOBO_OBJECT (control),
 				     BONOBO_OBJECT (stream));
 
-	return BONOBO_OBJECT (control);
+	return control;
 }
-
-void
-itip_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory",
-		itip_control_factory, NULL);
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));;
-	
-	if (factory == NULL)
-		g_error ("I could not register an iTip control factory.");
-}
-