Updated to be a shared library.

* GNOME_Evolution_Summary.server.in.in: Updated to be a shared
library.

* main.c: Removed.

* Makefile.am: Update to compile as a shared library.

* component-factory.c: Changed to be a shared library factory, for
both the ShellComponent and the ConfigControl objects.

* e-summary-preferences.c
(e_summary_preferences_init_config_control): Renamed from
e_summary_preferences_register_config_control_factory.
(e_summary_preferences_create_control): Renamed from factory_fn
and removed all args.

svn path=/trunk/; revision=19007

1 files changed, 5 insertions, 13 deletions

diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 0d5db9235d..e14573594f 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -55,8 +55,6 @@
 
 #include "evolution-config-control.h"
 
-#define FACTORY_ID "OAFIID:GNOME_Evolution_Summary_ConfigControlFactory"
-
 static ESummaryPrefs *global_preferences = NULL;
 static GNOME_Evolution_Shell global_shell = NULL;
 
@@ -1229,10 +1227,8 @@ config_control_destroy_cb (EvolutionConfigControl *config_control,
 	free_property_dialog (pd);
 }
 
-static BonoboObject *
-factory_fn (BonoboGenericFactory *generic_factory,
-	    const char *id,
-	    void *data)
+BonoboObject *
+e_summary_preferences_create_control (void)
 {
 	PropertyData *pd;
 	GtkWidget *widget;
@@ -1263,13 +1259,9 @@ factory_fn (BonoboGenericFactory *generic_factory,
 	return BONOBO_OBJECT (pd->config_control);
 }
 
-gboolean
-e_summary_preferences_register_config_control_factory (GNOME_Evolution_Shell corba_shell)
+/* FIXME this kinda sucks.  */
+void
+e_summary_preferences_init_control (GNOME_Evolution_Shell corba_shell)
 {
-	if (bonobo_generic_factory_new (FACTORY_ID, factory_fn, NULL) == NULL)
-		return FALSE;
-
 	global_shell = corba_shell;
-	
-	return TRUE;
 }