[evolution-patches] 41710 shell component ping deadlock

[Dan Winship <danw ximian com>]

This prevents a deadlock in connector by disabling the shell component
ping code. Hopefully we can fix the underlying problem for 1.4.1

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1256
diff -u -r1.1256 ChangeLog
--- ChangeLog	24 Apr 2003 01:56:46 -0000	1.1256
+++ ChangeLog	24 Apr 2003 20:32:35 -0000
@@ -1,3 +1,9 @@
+2003-04-24  Dan Winship  <danw ximian com>
+
+	* evolution-shell-component.c (impl_setOwner): Comment out the
+	pinging code again since it's only being used by Connector, where
+	it's triggering an unrelated bug.
+
 2003-04-23  Not Zed  <NotZed Ximian com>
 
 	* e-local-storage.c (load_folder): cast to remove warning.
Index: evolution-shell-component.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-shell-component.c,v
retrieving revision 1.86
diff -u -r1.86 evolution-shell-component.c
--- evolution-shell-component.c	16 Apr 2003 14:49:19 -0000	1.86
+++ evolution-shell-component.c	24 Apr 2003 20:32:35 -0000
@@ -202,6 +202,7 @@
 }
 
 
+#if 0
 /* Owner pinging.  */
 
 static gboolean
@@ -265,6 +266,7 @@
 
 	priv->ping_timeout_id = g_timeout_add (PING_DELAY, owner_ping_callback, shell_component);
 }
+#endif
 
 
 /* CORBA interface implementation.  */
@@ -430,16 +432,20 @@
 	}
 
 	if (ev->_major == CORBA_NO_EXCEPTION) {
+#if 0
 		BonoboObject *local_object;
+#endif
 
 		priv->owner_client = evolution_shell_client_new (shell);
 		g_signal_emit (shell_component, signals[OWNER_SET], 0, priv->owner_client, evolution_homedir);
 
+#if 0
 		/* Set up pinging of the shell (to realize if it's gone unexpectedly) when in the
 		   non-local case.  */
 		local_object = bonobo_object (ORBit_small_get_servant (shell));
 		if (local_object == NULL)
 			setup_owner_pinging (shell_component);
+#endif
 	}
 }