evolution-exchange r1749 - in trunk: . calendar

[msuman svn gnome org]

Author: msuman
Date: Mon Aug 18 05:19:18 2008
New Revision: 1749
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1749&view=rev

Log:
Milan Crha  <mcrha redhat com> ** Fix for bug #462242 (Report success when trying to delete nonexisting calendar on the server).

Modified:
   trunk/ChangeLog
   trunk/calendar/e-cal-backend-exchange.c

Modified: trunk/calendar/e-cal-backend-exchange.c
==============================================================================
--- trunk/calendar/e-cal-backend-exchange.c	(original)
+++ trunk/calendar/e-cal-backend-exchange.c	Mon Aug 18 05:19:18 2008
@@ -519,6 +519,12 @@
 	const char *uri;
 
 	d(printf("ecbe_remove_calendar(%p, %p)\n", backend, cal));
+
+	/* If we do not have a folder, then that means there is no corresponding folder on the server,
+	   thus pretend we removed it successfully. It's not there anyway, thus should be fine. */
+	if (!cbex->folder)
+		return GNOME_Evolution_Calendar_Success;
+
 	uri = e_folder_exchange_get_internal_uri (cbex->folder);
 	result = exchange_account_remove_folder (cbex->account, uri);
 	if (result == EXCHANGE_ACCOUNT_FOLDER_OK)