diff options
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 461807a3d9..17f5bc2c72 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -425,13 +425,16 @@ impl_Shell_getLocalStorage (PortableServer_Servant servant, EShell *shell; EShellPrivate *priv; - if (raise_exception_if_not_ready (servant, ev)) - return CORBA_OBJECT_NIL; - bonobo_object = bonobo_object_from_servant (servant); shell = E_SHELL (bonobo_object); priv = shell->priv; + if (priv->local_storage == NULL) { + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, + ex_GNOME_Evolution_Shell_NotReady, NULL); + return CORBA_OBJECT_NIL; + } + local_storage_interface = e_local_storage_get_corba_interface (priv->local_storage); bonobo_object_dup_ref (local_storage_interface, ev); |