diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-06-19 23:21:55 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-06-19 23:21:55 +0800 |
| commit | d71bbed0bd9d3bfd491c3c72049c79e4af6ce019 (patch) | |
| tree | 33248ddd35688a25b9314ba27f7c29fb88993be9 /shell/e-shell.c | |
| parent | 00616affbab883a044e1c048c6f887f2f55bd11b (diff) | |
| download | gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.tar gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.tar.gz gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.tar.bz2 gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.tar.lz gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.tar.xz gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.tar.zst gsoc2013-evolution-d71bbed0bd9d3bfd491c3c72049c79e4af6ce019.zip | |
Don't call bonobo_activation_active_server_unregister() here, it's too
2006-06-17 Tor Lillqvist <tml@novell.com>
* e-shell.c (impl_finalize): Don't call
bonobo_activation_active_server_unregister() here, it's too late,
the EShell Bonobo object has already been deactivated and its
associated CORBA object is NULL.
(notify_no_windows_left_idle_cb): Instead, call
bonobo_activation_active_server_unregister() here, when the EShell
Bonobo object is still fully active.
svn path=/trunk/; revision=32177
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 396ab8a4bd..962fc13c2c 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -360,13 +360,18 @@ static gboolean notify_no_windows_left_idle_cb (void *data) { EShell *shell; + EShellPrivate *priv; shell = E_SHELL (data); + priv = shell->priv; set_interactive (shell, FALSE); g_signal_emit (shell, signals [NO_WINDOWS_LEFT], 0); + if (priv->iid != NULL) + bonobo_activation_active_server_unregister (priv->iid, + bonobo_object_corba_objref (BONOBO_OBJECT (shell))); bonobo_object_unref (BONOBO_OBJECT (shell)); return FALSE; @@ -468,10 +473,6 @@ impl_finalize (GObject *object) shell = E_SHELL (object); priv = shell->priv; - if (priv->iid != NULL) - bonobo_activation_active_server_unregister (priv->iid, - bonobo_object_corba_objref (BONOBO_OBJECT (shell))); - e_free_string_list (priv->crash_type_names); g_free (priv); |