diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-09-06 07:39:24 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-09-06 07:39:24 +0800 |
| commit | 0d760f9018672886d53c51010bb7c896687c24c1 (patch) | |
| tree | 1bc3810fd3701cea188958f050a1d23db921dd52 /calendar/gui/component-factory.c | |
| parent | ab8885da53da6573d62789f07f6ebc4d75839e3c (diff) | |
| download | gsoc2013-evolution-0d760f9018672886d53c51010bb7c896687c24c1.tar.gz gsoc2013-evolution-0d760f9018672886d53c51010bb7c896687c24c1.tar.zst gsoc2013-evolution-0d760f9018672886d53c51010bb7c896687c24c1.zip | |
[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
Diffstat (limited to 'calendar/gui/component-factory.c')
| -rw-r--r-- | calendar/gui/component-factory.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index 10d53a54ea..5954cf88d9 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -41,9 +41,9 @@ -/* OAFIID for the component factory */ -#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" - +/* OAFIID for the component. */ +#define COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent" + /* Folder type IDs */ #define FOLDER_CALENDAR "calendar" #define FOLDER_TASKS "tasks" @@ -479,8 +479,7 @@ destroy_cb (EvolutionShellComponent *shell_component, /* The factory function. */ static BonoboObject * -factory_fn (BonoboGenericFactory *factory, - void *closure) +create_object (void) { EvolutionShellComponent *shell_component; @@ -498,6 +497,7 @@ factory_fn (BonoboGenericFactory *factory, GTK_SIGNAL_FUNC (owner_set_cb), NULL); gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset", GTK_SIGNAL_FUNC (owner_unset_cb), NULL); + #if 0 gtk_signal_connect (GTK_OBJECT (shell_component), "destroy", GTK_SIGNAL_FUNC (destroy_cb), NULL); @@ -526,17 +526,16 @@ factory_fn (BonoboGenericFactory *factory, } - void component_factory_init (void) { - if (factory != NULL) - return; + BonoboObject *object; + int result; - factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory)); + object = create_object (); - if (factory == NULL) - g_error ("Cannot initialize Evolution's calendar component."); + result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (object)); + if (result == OAF_REG_ERROR) + g_error ("Cannot initialize Evolution's calendar component."); } |