File bnc-219729-eds-exchange-loading.diff of Package evolution-data-server-2.6

Overview Repositories Revisions Requests Users Attributes Meta

File bnc-219729-eds-exchange-loading.diff of Package evolution-data-server-2.6

Index: calendar/libecal/e-cal-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-listener.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-cal-listener.c
--- calendar/libecal/e-cal-listener.c	31 Aug 2005 04:21:54 -0000	1.17
+++ calendar/libecal/e-cal-listener.c	13 Nov 2006 10:31:15 -0000
@@ -95,6 +95,8 @@ convert_status (const GNOME_Evolution_Ca
 		return E_CALENDAR_STATUS_UNKNOWN_USER;
 	case GNOME_Evolution_Calendar_InvalidServerVersion:
 		return E_CALENDAR_STATUS_INVALID_SERVER_VERSION;
+	case GNOME_Evolution_Calendar_NoSuchCal:
+	      return E_CALENDAR_STATUS_NO_SUCH_CALENDAR;
 	
 	case GNOME_Evolution_Calendar_OtherError:
 	default:
Index: servers/exchange/storage/exchange-account.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-account.c,v
retrieving revision 1.36
diff -u -p -r1.36 exchange-account.c
--- servers/exchange/storage/exchange-account.c	12 Oct 2006 12:38:17 -0000	1.36
+++ servers/exchange/storage/exchange-account.c	13 Nov 2006 10:31:16 -0000
@@ -1372,9 +1393,16 @@ exchange_account_connect (ExchangeAccoun
 
 	*info_result = EXCHANGE_ACCOUNT_CONNECT_SUCCESS;
 	exchange_account_is_offline (account, &mode);
-
+	
 	g_mutex_lock (account->priv->connect_lock);
 
+	if (mode == UNSUPPORTED_MODE) {
+		*info_result = EXCHANGE_ACCOUNT_CONNECT_ERROR;
+		account->priv->connecting = FALSE;
+		g_mutex_unlock (account->priv->connect_lock);
+		return NULL;
+	}
+	
 	if (account->priv->connecting || mode == OFFLINE_MODE) {
 		g_mutex_unlock (account->priv->connect_lock);
 		if (mode == OFFLINE_MODE) {

Places

File bnc-219729-eds-exchange-loading.diff of Package evolution-data-server-2.6

Places