evolution-data-server r8604 - in branches/gnome-2-22/calendar: . libedata-cal

[mcrha svn gnome org]

Author: mcrha
Date: Mon Mar 31 12:26:27 2008
New Revision: 8604
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8604&view=rev

Log:
2008-03-31  Ondrej Jirman  <megous megous com>

	** Fix for bug #494311

	* libedata-cal/e-cal-backend.c: (listener_died_cb):
	Don't terminate connection after sucessful reconnect by ORBit. See
	the comment in link_connection_state_changed_T_R ORBit function which states
	that connection could have already been re-established at the time
	listener_died_cb gets called. We need to check current connection status
	in the callback.



Modified:
   branches/gnome-2-22/calendar/ChangeLog
   branches/gnome-2-22/calendar/libedata-cal/e-cal-backend.c

Modified: branches/gnome-2-22/calendar/libedata-cal/e-cal-backend.c
==============================================================================
--- branches/gnome-2-22/calendar/libedata-cal/e-cal-backend.c	(original)
+++ branches/gnome-2-22/calendar/libedata-cal/e-cal-backend.c	Mon Mar 31 12:26:27 2008
@@ -384,7 +384,8 @@
 {
 	EDataCal *cal = E_DATA_CAL (data);
 
-	e_cal_backend_remove_client (e_data_cal_get_backend (cal), cal);
+	if (ORBit_small_get_connection_status (e_data_cal_get_listener(cal)) == ORBIT_CONNECTION_DISCONNECTED)
+		e_cal_backend_remove_client (e_data_cal_get_backend (cal), cal);
 }
 
 static void