diff options
| -rw-r--r-- | shell/ChangeLog | 8 | ||||
| -rw-r--r-- | shell/evolution-storage.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 0239d9026d..27fda3f519 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2000-07-06 Ettore Perazzoli <ettore@helixcode.com> + + * evolution-storage.c: Removed `corba_storage_registry' member + from `EvolutionStoragePrivate'. + (destroy): Don't unref/release it. Call + `StorageListener::destroy' to notify that we are dead. + (evolution_storage_register): Don't ref and store the registry. + 2000-07-05 Dan Winship <danw@helixcode.com> * e-shell.c (e_shell_save_settings): Use the correct gconf path diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 7a96fa9c07..2503905b13 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -40,7 +40,6 @@ static BonoboObjectClass *parent_class = NULL; struct _EvolutionStoragePrivate { char *name; - Evolution_StorageRegistry corba_storage_registry; Evolution_StorageListener corba_storage_listener; }; @@ -104,12 +103,9 @@ destroy (GtkObject *object) CORBA_exception_init (&ev); - if (priv->corba_storage_registry != CORBA_OBJECT_NIL) { - Bonobo_Unknown_unref (priv->corba_storage_registry, &ev); - CORBA_Object_release (priv->corba_storage_registry, &ev); - } - if (priv->corba_storage_listener != CORBA_OBJECT_NIL) { + Evolution_StorageListener_destroyed (priv->corba_storage_listener, &ev); + /* (This is not a Bonobo object, so no unref.) */ CORBA_Object_release (priv->corba_storage_listener, &ev); } @@ -237,11 +233,7 @@ evolution_storage_register (EvolutionStorage *evolution_storage, priv->name, &ev); if (ev._major == CORBA_NO_EXCEPTION) { - Bonobo_Unknown_ref (corba_storage_registry, &ev); - priv->corba_storage_registry = CORBA_Object_duplicate (corba_storage_registry, &ev); - priv->corba_storage_listener = corba_storage_listener; - result = EVOLUTION_STORAGE_OK; } else { if (ev._major != CORBA_USER_EXCEPTION) |