diff options
Diffstat (limited to 'shell/evolution-shell-component.c')
| -rw-r--r-- | shell/evolution-shell-component.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index dc27a951c9..2063be04f7 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -407,12 +407,14 @@ impl_unsetOwner (PortableServer_Servant servant, return; } + if (priv->ping_timeout_id != -1) { + g_source_remove (priv->ping_timeout_id); + priv->ping_timeout_id = -1; + } + bonobo_object_unref (BONOBO_OBJECT (priv->owner_client)); priv->owner_client = NULL; - if (priv->ping_timeout_id != -1) - g_source_remove (priv->ping_timeout_id); - gtk_signal_emit (GTK_OBJECT (shell_component), signals[OWNER_UNSET]); } @@ -653,8 +655,10 @@ destroy (GtkObject *object) priv = shell_component->priv; - if (priv->ping_timeout_id != -1) + if (priv->ping_timeout_id != -1) { g_source_remove (priv->ping_timeout_id); + priv->ping_timeout_id = -1; + } CORBA_exception_init (&ev); |