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, 11 insertions, 61 deletions

diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
index ea64073540..8f0ed87967 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
@@ -1,21 +1,21 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-calendar">
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory"
+            type="shlib"
+            location="@COMPONENTDIR@/libevolution-calendar.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
+                       _value="Factory for the Evolution Calendar objects"/>
 
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Control:1.0"/>
@@ -29,14 +29,11 @@
 
 	<oaf_attribute name="name" type="string"
 		       _value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-calendar">
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -51,21 +48,9 @@
 		       value="3"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Calendar control"/>
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/calendar-control:1.0"/>
@@ -81,21 +66,9 @@
 	               _value="A sample Bonobo control which displays an calendar."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Evolution Tasks control"/>
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/tasks-control:1.0"/>
@@ -111,21 +84,9 @@
 	               _value="A Bonobo control which displays a task list."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to create a component editor factory"/>
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
@@ -136,19 +97,9 @@
                        _value="Factory to centralize calendar component editor dialogs"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory">
+	    location="OAFIID:GNOME_Evolution_Calendar_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
@@ -176,4 +127,3 @@
 </oaf_server>
 
 </oaf_info>
-