From 93178424f2a5504adcec14f89d868f00bca60f38 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 31 May 2012 11:50:44 +0200
Subject: Bug #673946 - Cannot delete search folders

---
 mail/e-mail-reader-utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 0a8e358938..6d3f6aafc5 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -198,13 +198,13 @@ e_mail_reader_delete_folder (EMailReader *reader,
 	EShell *shell;
 	EAlertSink *alert_sink;
 	CamelStore *parent_store;
+	CamelProvider *provider;
 	MailFolderCache *folder_cache;
 	GtkWindow *parent = e_shell_get_active_window (NULL);
 	GtkWidget *dialog;
 	gboolean store_is_local;
 	const gchar *display_name;
 	const gchar *full_name;
-	const gchar *uid;
 	CamelFolderInfoFlags flags = 0;
 	gboolean have_flags;
 
@@ -214,9 +214,9 @@ e_mail_reader_delete_folder (EMailReader *reader,
 	full_name = camel_folder_get_full_name (folder);
 	display_name = camel_folder_get_display_name (folder);
 	parent_store = camel_folder_get_parent_store (folder);
+	provider = camel_service_get_provider (CAMEL_SERVICE (parent_store));
 
-	uid = camel_service_get_uid (CAMEL_SERVICE (parent_store));
-	store_is_local = (g_strcmp0 (uid, E_MAIL_SESSION_LOCAL_UID) == 0);
+	store_is_local = (provider->flags & CAMEL_PROVIDER_IS_LOCAL) != 0;
 
 	backend = e_mail_reader_get_backend (reader);
 	session = e_mail_backend_get_session (backend);
-- 
cgit v1.2.3