aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/evolution-shell-client.c11
2 files changed, 16 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 45b4f096aa..9ae2116d8d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-17 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-shell-client.c
+ (evolution_shell_client_get_local_storage): Added some g_warnings
+ for when we return CORBA_OBJECT_NIL; this might help to figure out
+ what is wrong with bug #6625. Also, added a missing
+ CORBA_exception_free().
+
2001-08-17 Jeffrey Stedfast <fejj@ximian.com>
* e-shell.c (e_shell_construct): Don't destroy the splash twice.
diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c
index b907f7e97a..b8d454155f 100644
--- a/shell/evolution-shell-client.c
+++ b/shell/evolution-shell-client.c
@@ -457,11 +457,16 @@ evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client)
CORBA_exception_init (&ev);
corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
- if (corba_shell == CORBA_OBJECT_NIL)
+ if (corba_shell == CORBA_OBJECT_NIL) {
+ g_warning ("evolution_shell_client_get_local_storage() invoked on an "
+ "EvolutionShellClient that doesn't have a CORBA objref???");
+ CORBA_exception_free (&ev);
return CORBA_OBJECT_NIL;
+ }
corba_local_storage = GNOME_Evolution_Shell_getLocalStorage (corba_shell, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
+ g_warning ("evolution_shell_client_get_local_storage() failing -- %s ???", ev._repo_id);
CORBA_exception_free (&ev);
return CORBA_OBJECT_NIL;
}
@@ -478,8 +483,8 @@ evolution_shell_client_set_line_status (EvolutionShellClient *shell_client,
GNOME_Evolution_Shell corba_shell;
CORBA_Environment ev;
- g_return_val_if_fail (shell_client != NULL, CORBA_OBJECT_NIL);
- g_return_val_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client), CORBA_OBJECT_NIL);
+ g_return_if_fail (shell_client != NULL, CORBA_OBJECT_NIL);
+ g_return_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client), CORBA_OBJECT_NIL);
CORBA_exception_init (&ev);