[evolution-mapi] Bug #628851 - Cannot delete address book.

[Bharath Acharya <abharath src gnome org>]

commit e04c4d897476c5c2cfbe87e20961b01ebe030b14
Author: Bharath Acharya <abharath novell com>
Date:   Thu Sep 9 11:41:46 2010 +0530

    Bug #628851 - Cannot delete address book.
    
    Deleted address book appears on restart, not deleted on the server.
    Delete only when not a public folder.

 src/addressbook/e-book-backend-mapi-contacts.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi-contacts.c b/src/addressbook/e-book-backend-mapi-contacts.c
index 6db37a4..9b6561f 100644
--- a/src/addressbook/e-book-backend-mapi-contacts.c
+++ b/src/addressbook/e-book-backend-mapi-contacts.c
@@ -698,7 +698,7 @@ ebbm_contacts_remove (EBookBackendMAPI *ebma, GError **error)
 		return;
 	}
 
-	if (priv->is_public_folder) {
+	if (!priv->is_public_folder) {
 		ExchangeMapiConnection *conn;
 
 		e_book_backend_mapi_lock_connection (ebma);
@@ -707,7 +707,7 @@ ebbm_contacts_remove (EBookBackendMAPI *ebma, GError **error)
 		if (!conn) {
 			g_propagate_error (error, EDB_ERROR (OFFLINE_UNAVAILABLE));
 		} else {
-			exchange_mapi_connection_remove_folder (conn, priv->fid, MAPI_OPTIONS_USE_PFSTORE, &mapi_error);
+			exchange_mapi_connection_remove_folder (conn, priv->fid, 0, &mapi_error);
 
 			if (mapi_error) {
 				mapi_error_to_edb_error (error, mapi_error, E_DATA_BOOK_STATUS_OTHER_ERROR, _("Failed to remove public folder"));