aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-shell.c10
2 files changed, 15 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ab6626f6a2..da27e9bd3a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2001-09-14 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell.c (impl_Shell_getLocalStorage): Return a proper value.
+ (impl_Shell_createStorageSetView): Likewise.
+ (impl_Shell_setLineStatus): Likewise.
+ (impl_Shell__get_displayName): Likewise.
+ (impl_Shell_getComponentByType): Likewise.
+ (impl_Shell_createNewView): Likewise.
+ (impl_Shell_handleURI): Likewise.
+
2001-09-14 Iain Holmes <iain@ximian.com>
* e-shell-importer.c (start_import): Only check for local path if the
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 34f1851230..461807a3d9 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -221,7 +221,7 @@ impl_Shell__get_displayName (PortableServer_Servant servant,
CORBA_char *retval;
if (raise_exception_if_not_ready (servant, ev))
- return;
+ return NULL;
display_string = DisplayString (gdk_display);
if (display_string == NULL)
@@ -245,7 +245,7 @@ impl_Shell_getComponentByType (PortableServer_Servant servant,
EShell *shell;
if (raise_exception_if_not_ready (servant, ev))
- return;
+ return CORBA_OBJECT_NIL;
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);
@@ -275,7 +275,7 @@ impl_Shell_createNewView (PortableServer_Servant servant,
GNOME_Evolution_ShellView shell_view_interface;
if (raise_exception_if_not_ready (servant, ev))
- return;
+ return CORBA_OBJECT_NIL;
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);
@@ -426,7 +426,7 @@ impl_Shell_getLocalStorage (PortableServer_Servant servant,
EShellPrivate *priv;
if (raise_exception_if_not_ready (servant, ev))
- return;
+ return CORBA_OBJECT_NIL;
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);
@@ -448,7 +448,7 @@ impl_Shell_createStorageSetView (PortableServer_Servant servant,
BonoboControl *control;
if (raise_exception_if_not_ready (servant, ev))
- return;
+ return CORBA_OBJECT_NIL;
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);