From 6a9d2e6b0d1db2dd9f1bc76413bd06e130f48fb8 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 20 Nov 2002 22:46:40 +0000
Subject: Removed unused #define COMPONENT_FACTORY_ID.
 (component_factory_init):

* component-factory.c: Removed unused #define
COMPONENT_FACTORY_ID.
(component_factory_init): Removed unused variable.

* GNOME_Evolution_Summary.server.in.in: Updated to not use a
factory, which is what the code actually expects.

svn path=/trunk/; revision=18867
---
 my-evolution/ChangeLog                            |  9 +++++++++
 my-evolution/GNOME_Evolution_Summary.server.in.in | 16 ++--------------
 my-evolution/component-factory.c                  |  4 +---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 8cd0595167..9396182ee3 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
+
+	* component-factory.c: Removed unused #define
+	COMPONENT_FACTORY_ID.
+	(component_factory_init): Removed unused variable.
+
+	* GNOME_Evolution_Summary.server.in.in: Updated to not use a
+	factory, which is what the code actually expects.
+
 2002-11-20  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-summary.c (e_summary_init): Use GConf.
diff --git a/my-evolution/GNOME_Evolution_Summary.server.in.in b/my-evolution/GNOME_Evolution_Summary.server.in.in
index 523fa9fbce..7ab98342a6 100644
--- a/my-evolution/GNOME_Evolution_Summary.server.in.in
+++ b/my-evolution/GNOME_Evolution_Summary.server.in.in
@@ -1,8 +1,8 @@
 <oaf_info>
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory">
+	      type="exe"
+	      location="@LIBEXECDIR@/evolution-executive-summary">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -15,18 +15,6 @@
 		   value="evolution-today.png"/>
     <oaf_attribute name="evolution:shell_component_launch_order" type="number"
 		   value="4"/>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-executive-summary">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Factory for the Evolution Summary component."/>
 
   </oaf_server>
 
diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index 481d817403..a60bd2374a 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -43,8 +43,7 @@
 
 #include "component-factory.h"
 
-#define COMPONENT_ID         "OAFIID:GNOME_Evolution_Summary_ShellComponent"
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
+#define COMPONENT_ID "OAFIID:GNOME_Evolution_Summary_ShellComponent"
 
 static gint running_objects = 0;
 static ESummaryPrefs *global_preferences = NULL;
@@ -161,7 +160,6 @@ create_component (void)
 void
 component_factory_init (void)
 {
-	BonoboGenericFactory *factory;
 	Bonobo_RegistrationResult result;
 	BonoboObject *shell_component;
 
-- 
cgit v1.2.3