diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-12-05 06:01:31 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-12-05 06:01:31 +0800 |
| commit | ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99 (patch) | |
| tree | 611228418dfc40f16cb41081d1745890c7761e23 /shell | |
| parent | fc99cb4acc8ceb442d65171671f1100aff549786 (diff) | |
| download | gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.tar gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.tar.gz gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.tar.bz2 gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.tar.lz gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.tar.xz gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.tar.zst gsoc2013-evolution-ca38e63a1bb3db4607b8ddfcff334e6ba4c7ef99.zip | |
Handle a NIL return value from `oaf_activate_from_id' without
crashing.
svn path=/trunk/; revision=6784
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/main.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index e3a33d5953..e7c5c16e2f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2000-12-04 Ettore Perazzoli <ettore@helixcode.com> + + * main.c (new_view_on_running_shell): Don't crash if the object + returned from `oaf_activate_from_id' is NIL and the exception + isn't set. Just handle this as a normal error condition. + 2000-12-04 Michael Meeks <michael@helixcode.com> * e-shell-view.c (get_control_for_uri): return NULL if we can't diff --git a/shell/main.c b/shell/main.c index 421dc85ba9..a628348049 100644 --- a/shell/main.c +++ b/shell/main.c @@ -126,7 +126,8 @@ new_view_on_running_shell (void) CORBA_exception_init (&ev); corba_object = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); - if (ev._major != CORBA_NO_EXCEPTION) { + if (ev._major != CORBA_NO_EXCEPTION + || CORBA_Object_is_nil (corba_object, &ev)) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize the Evolution shell.")); return; |