1 files changed, 44 insertions, 25 deletions

diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index b0fbfc65d2..c22987b37c 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -39,12 +39,13 @@
 #include "em-folder-properties.h"
 #include "em-config.h"
 
-#include "mail-component.h"
 #include "mail-ops.h"
 #include "mail-mt.h"
 #include "mail-vfolder.h"
 #include "mail-config.h"
 
+#include "e-mail-shell-backend.h"
+
 struct _prop_data {
 	void *object;
 	CamelArgV *argv;
@@ -287,7 +288,10 @@ static EMConfigItem emfp_items[] = {
 static gboolean emfp_items_translated = FALSE;
 
 static void
-emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota, void *data)
+emfp_dialog_got_folder_quota (CamelFolder *folder,
+                              const gchar *folder_uri,
+                              CamelFolderQuotaInfo *quota,
+                              void *data)
 {
 	GtkWidget *dialog, *w;
 	struct _prop_data *prop_data;
@@ -295,20 +299,28 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
 	gint32 count, i,deleted;
 	EMConfig *ec;
 	EMConfigTargetFolder *target;
+	EShellBackend *shell_backend;
+	EShellWindow *shell_window;
+	EShellView *shell_view;
 	CamelArgGetV *arggetv;
 	CamelArgV *argv;
+	CamelStore *local_store;
 	gboolean hide_deleted;
 	GConfClient *gconf;
 	CamelStore *store;
-	char *uri = (char *)data;
 
-	if (folder == NULL) {
-		g_free (uri);
+	if (folder == NULL)
 		return;
-	}
 
 	store = folder->parent_store;
 
+	shell_view = E_SHELL_VIEW (data);
+	shell_backend = e_shell_view_get_shell_backend (shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	local_store = e_mail_shell_backend_get_local_store (
+		E_MAIL_SHELL_BACKEND (shell_backend));
+
 	prop_data = g_malloc0 (sizeof (*prop_data));
 	prop_data->object = folder;
 	camel_object_ref (folder);
@@ -341,7 +353,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
 		camel_object_get (folder, NULL, CAMEL_FOLDER_TOTAL, &prop_data->total, NULL);
 	}
 
-	if (store == mail_component_peek_local_store(NULL)
+	if (store == local_store
 	    && (!strcmp(prop_data->name, "Drafts")
 		|| !strcmp(prop_data->name, "Templates")
 		|| !strcmp(prop_data->name, "Inbox")
@@ -387,11 +399,11 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
 	g_free (arggetv);
 	prop_data->argv = argv;
 
-	dialog = gtk_dialog_new_with_buttons (_("Folder Properties"), NULL,
-					      GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
+	dialog = gtk_dialog_new_with_buttons (
+		_("Folder Properties"), GTK_WINDOW (shell_window),
+		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 	gtk_window_set_default_size ((GtkWindow *) dialog, 192, 160);
 	gtk_widget_ensure_style (dialog);
 	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
@@ -411,7 +423,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
 		l = g_slist_prepend(l, &emfp_items[i]);
 	e_config_add_items((EConfig *)ec, l, emfp_commit, NULL, emfp_free, prop_data);
 
-	target = em_config_target_new_folder(ec, folder, uri);
+	target = em_config_target_new_folder(ec, folder, folder_uri);
 	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
 	w = e_config_create_widget((EConfig *)ec);
 
@@ -421,15 +433,17 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
 
 	g_signal_connect (dialog, "response", G_CALLBACK (emfp_dialog_response), prop_data);
 	gtk_widget_show (dialog);
-
-	g_free (uri);
 }
 
 static void
 emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data)
 {
+	EShellView *shell_view = data;
+
 	/* this should be called in a thread too */
-	mail_get_folder_quota (folder, emfp_dialog_got_folder_quota, g_strdup (uri), mail_msg_unordered_push);
+	mail_get_folder_quota (
+		folder, uri, emfp_dialog_got_folder_quota,
+		shell_view, mail_msg_unordered_push);
 }
 
 /**
@@ -442,27 +456,32 @@ emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data)
  * as NULL, then the folder @uri will be loaded first.
  **/
 void
-em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const char *uri)
+em_folder_properties_show (EShellView *shell_view,
+                           CamelFolder *folder,
+                           const gchar *uri)
 {
+	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
+	g_return_if_fail (uri != NULL);
+
 	/* HACK: its the old behaviour, not very 'neat' but it works */
-	if (!strncmp(uri, "vfolder:", 8)) {
-		CamelURL *url = camel_url_new(uri, NULL);
+	if (!strncmp (uri, "vfolder:", 8)) {
+		CamelURL *url = camel_url_new (uri, NULL);
 
 		/* MORE HACK: UNMATCHED is a special folder which you can't modify, so check for it here */
 		if (url == NULL
 		    || url->fragment == NULL
 		    || strcmp(url->fragment, CAMEL_UNMATCHED_NAME) != 0) {
 			if (url)
-				camel_url_free(url);
-			vfolder_edit_rule(uri);
+				camel_url_free (url);
+			vfolder_edit_rule (uri);
 			return;
 		}
-		if (url)
-			camel_url_free(url);
+		if (url != NULL)
+			camel_url_free (url);
 	}
 
 	if (folder == NULL)
-		mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push);
+		mail_get_folder(uri, 0, emfp_dialog_got_folder, shell_view, mail_msg_unordered_push);
 	else
-		emfp_dialog_got_folder((char *)uri, folder, NULL);
+		emfp_dialog_got_folder((char *)uri, folder, shell_view);
 }