aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/evolution-shell-component.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3d10b3e511..6a6fbde975 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2001-10-22 Ettore Perazzoli <ettore@ximian.com>
+ * evolution-shell-component.c (impl_unsetOwner): Remove the ping
+ timeout.
+
+2001-10-22 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell.c (impl_Shell_selectUserFolder): Don't die if the parent
window has no WMHints.
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index 2526ba61b6..fa94646fb1 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -411,6 +411,9 @@ impl_unsetOwner (PortableServer_Servant servant,
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]);
}