diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/evolution-shell-component-utils.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index dc6635ac9f..e48e5e1f60 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2002-10-21 Ettore Perazzoli <ettore@ximian.com> + + * evolution-shell-component-utils.c + (e_get_activation_failure_msg): If the exception_id is NULL, + return NULL instead of crashing. [#25891] + 2002-10-17 Ettore Perazzoli <ettore@ximian.com> [Implement the Cancel button in the "Open other user's folder" diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index b3e806d296..b9e5215e69 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -155,6 +155,9 @@ e_get_activation_failure_msg (CORBA_Environment *ev) { g_return_val_if_fail (ev != NULL, NULL); + if (CORBA_exception_id (ev) == NULL) + return NULL; + if (strcmp (CORBA_exception_id (ev), ex_OAF_GeneralError) != 0) { return bonobo_exception_get_text (ev); } else { |