From 0d760f9018672886d53c51010bb7c896687c24c1 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 5 Sep 2001 23:39:24 +0000
Subject: [Fix #958, ShellComponents should not be created by factories, for
 the calendar.]

* gui/GNOME_Evolution_Calendar.oaf.in: Remove the
ShellComponentFactory.

* gui/component-factory.c (create_object): Renamed from
`component_fn'.  Don't get any args.
(component_factory_init): Create the component using
`create_object()' and register it into OAF.
(COMPONENT_FACTORY_ID): Removed.
(COMPONENT_ID): New.

svn path=/trunk/; revision=12645
---
 calendar/gui/GNOME_Evolution_Calendar.oaf.in | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'calendar/gui/GNOME_Evolution_Calendar.oaf.in')

diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
index 4d80cfa0de..640a28d6a1 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
@@ -34,23 +34,10 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
             type="exe"
             location="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 calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory">
-
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
-- 
cgit v1.2.3