aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-23 07:12:41 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-23 07:12:41 +0800
commit983bf4db553c87fb72fe3e00a0c6195874c9c95c (patch)
tree085e0ab468dae95addbc49c4b68c8d4155ef360c
parentdb215fd75c034a8b6154e624b23c346a72ad19a4 (diff)
downloadgsoc2013-evolution-983bf4db553c87fb72fe3e00a0c6195874c9c95c.tar.gz
gsoc2013-evolution-983bf4db553c87fb72fe3e00a0c6195874c9c95c.tar.zst
gsoc2013-evolution-983bf4db553c87fb72fe3e00a0c6195874c9c95c.zip
Remove the ping timeout.
* evolution-shell-component.c (impl_unsetOwner): Remove the ping timeout. svn path=/trunk/; revision=13908
-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]);
}