** See bug #52994.

2004-02-02  Not Zed  <NotZed@Ximian.com>

        ** See bug #52994.

        * em-folder-properties.c (em_folder_properties_show): redirect
        vFolder uri's to the vFolder editor.

        ** See bug #53502.

        * em-folder-browser.c (emfb_folder_properties): implement.

        * em-folder-tree.c (emft_popup_properties): fixed for change
        below.

        * em-folder-properties.[ch]: Moved the folder properties window
        from em-folder-tree.c to its own file.

svn path=/trunk/; revision=24564

6 files changed, 331 insertions, 208 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1b90863d5a..dccbd90acb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,22 @@
 2004-02-02  Not Zed  <NotZed@Ximian.com>
 
+	** See bug #52994.
+
+	* em-folder-properties.c (em_folder_properties_show): redirect
+	vFolder uri's to the vFolder editor.
+
+	** See bug #53502.
+
+	* em-folder-browser.c (emfb_folder_properties): implement.
+
+	* em-folder-tree.c (emft_popup_properties): fixed for change
+	below.
+
+	* em-folder-properties.[ch]: Moved the folder properties window
+	from em-folder-tree.c to its own file.
+
+2004-02-02  Not Zed  <NotZed@Ximian.com>
+
 	** See bug #53559.
 
 	* em-folder-tree.c (folder_tree_new): set CAN_FOCUS flag on the
diff --git a/mail/Makefile.am b/mail/Makefile.am
index bc67f74dbd..97a9b33498 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -69,6 +69,8 @@ libevolution_mail_la_SOURCES =			\
 	em-mailer-prefs.h			\
 	em-inline-filter.c			\
 	em-inline-filter.h			\
+	em-folder-properties.c			\
+	em-folder-properties.h			\
 	em-folder-selection.c			\
 	em-folder-selection.h			\
 	em-folder-selection-button.c		\
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 23ac1dd6d0..dd89dc0226 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -79,6 +79,7 @@
 #include "em-format-html-display.h"
 #include "em-format-html-print.h"
 #include "em-folder-browser.h"
+#include "em-folder-properties.h"
 #include "em-subscribe-editor.h"
 #include "message-list.h"
 
@@ -536,9 +537,9 @@ emfb_edit_select_thread(BonoboUIComponent *uid, void *data, const char *path)
 static void
 emfb_folder_properties(BonoboUIComponent *uid, void *data, const char *path)
 {
-	/* If only we could remove this ... */
-	/* Should it be part of the factory? */
-	printf("FIXME: folderproperties\n");
+	EMFolderBrowser *emfb = data;
+
+	em_folder_properties_show(NULL, emfb->view.folder, emfb->view.folder_uri);
 }
 
 static void
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
new file mode 100644
index 0000000000..005b153ef3
--- /dev/null
+++ b/mail/em-folder-properties.c
@@ -0,0 +1,266 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Authors: Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtkbox.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtkdialog.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkframe.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmisc.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtktogglebutton.h>
+
+#include <camel/camel-folder.h>
+
+#include "em-folder-properties.h"
+
+#include "mail-ops.h"
+#include "mail-mt.h"
+#include "mail-vfolder.h"
+
+struct _prop_data {
+	void *object;
+	CamelArgV *argv;
+	GtkWidget **widgets;
+};
+
+static void
+emfp_dialog_response (GtkWidget *dialog, int response, struct _prop_data *prop_data)
+{
+	CamelArgV *argv = prop_data->argv;
+	int i;
+	
+	if (response != GTK_RESPONSE_OK) {
+		gtk_widget_destroy (dialog);
+		return;
+	}
+	
+	for (i = 0; i < argv->argc; i++) {
+		CamelArg *arg = &argv->argv[i];
+		
+		switch (arg->tag & CAMEL_ARG_TYPE) {
+		case CAMEL_ARG_BOO:
+			arg->ca_int = gtk_toggle_button_get_active ((GtkToggleButton *) prop_data->widgets[i]);
+			break;
+		case CAMEL_ARG_STR:
+			g_free (arg->ca_str);
+			arg->ca_str = (char *) gtk_entry_get_text ((GtkEntry *) prop_data->widgets[i]);
+			break;
+		default:
+			g_assert_not_reached ();
+			break;
+		}
+	}
+	
+	camel_object_setv (prop_data->object, NULL, argv);
+	gtk_widget_destroy (dialog);
+}
+
+static void
+emfp_dialog_free (void *data)
+{
+	struct _prop_data *prop_data = data;
+	int i;
+	
+	for (i = 0; i < prop_data->argv->argc; i++) {
+		if ((prop_data->argv->argv[i].tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR)
+			g_free (prop_data->argv->argv[i].ca_str);
+	}
+	
+	camel_object_unref (prop_data->object);
+	g_free (prop_data->argv);
+	g_free (prop_data);
+}
+
+static void
+emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data)
+{
+	GtkWidget *dialog, *w, *table, *label;
+	struct _prop_data *prop_data;
+	CamelArgGetV *arggetv;
+	CamelArgV *argv;
+	GSList *list, *l;
+	gint32 count, i;
+	char *name;
+	char countstr[16];
+	int row = 0, total=0, unread=0;
+	
+	if (folder == NULL)
+		return;
+	
+	camel_object_get (folder, NULL, CAMEL_FOLDER_PROPERTIES, &list, CAMEL_FOLDER_NAME, &name,
+			  CAMEL_FOLDER_TOTAL, &total, CAMEL_FOLDER_UNREAD, &unread, NULL);
+	
+	dialog = gtk_dialog_new_with_buttons (_("Folder properties"), NULL,
+					      GTK_DIALOG_DESTROY_WITH_PARENT,
+					      GTK_STOCK_OK, GTK_RESPONSE_OK,
+					      NULL);
+	
+	/* TODO: maybe we want some basic properties here, like message counts/approximate size/etc */
+	w = gtk_frame_new (_("Properties"));
+	gtk_widget_show (w);
+	gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, w, TRUE, TRUE, 6);
+	
+	table = gtk_table_new (g_slist_length (list) + 3, 2, FALSE);
+	gtk_widget_show (table);
+	gtk_container_add ((GtkContainer *) w, table);
+
+	/* TODO: can this be done in a loop? */
+	label = gtk_label_new (_("Folder Name"));
+	gtk_widget_show (label);
+	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
+	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
+	
+	label = gtk_label_new (name);
+	gtk_widget_show (label);
+	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
+	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
+	row++;
+
+	label = gtk_label_new (_("Total messages"));
+	gtk_widget_show (label);
+	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
+	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
+	
+	sprintf(countstr, "%d", total);
+	label = gtk_label_new (countstr);
+	gtk_widget_show (label);
+	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
+	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
+	row++;
+
+	label = gtk_label_new (_("Unread messages"));
+	gtk_widget_show (label);
+	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
+	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
+	
+	sprintf(countstr, "%d", unread);
+	label = gtk_label_new (countstr);
+	gtk_widget_show (label);
+	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
+	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
+	row++;
+
+	/* build an arggetv/argv to retrieve/store the results */
+	count = g_slist_length (list);
+	arggetv = g_malloc0 (sizeof (*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof (arggetv->argv[0]));
+	arggetv->argc = count;
+	argv = g_malloc0 (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]));
+	argv->argc = count;
+	
+	i = 0;
+	l = list;
+	while (l) {
+		CamelProperty *prop = l->data;
+		
+		argv->argv[i].tag = prop->tag;
+		arggetv->argv[i].tag = prop->tag;
+		arggetv->argv[i].ca_ptr = &argv->argv[i].ca_ptr;
+		
+		l = l->next;
+		i++;
+	}
+	
+	camel_object_getv (folder, NULL, arggetv);
+	g_free (arggetv);
+	
+	prop_data = g_malloc0 (sizeof (*prop_data));
+	prop_data->widgets = g_malloc0 (sizeof (prop_data->widgets[0]) * count);
+	prop_data->argv = argv;
+	
+	/* setup the ui with the values retrieved */
+	l = list;
+	i = 0;
+	while (l) {
+		CamelProperty *prop = l->data;
+		
+		switch (prop->tag & CAMEL_ARG_TYPE) {
+		case CAMEL_ARG_BOO:
+			w = gtk_check_button_new_with_label (prop->description);
+			gtk_toggle_button_set_active ((GtkToggleButton *) w, argv->argv[i].ca_int != 0);
+			gtk_widget_show (w);
+			gtk_table_attach ((GtkTable *) table, w, 0, 2, row, row + 1, 0, 0, 3, 3);
+			prop_data->widgets[i] = w;
+			break;
+		case CAMEL_ARG_STR:
+			label = gtk_label_new (prop->description);
+			gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
+			gtk_widget_show (label);
+			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 3, 3);
+			
+			w = gtk_entry_new ();
+			gtk_widget_show (w);
+			if (argv->argv[i].ca_str) {
+				gtk_entry_set_text ((GtkEntry *) w, argv->argv[i].ca_str);
+				camel_object_free (folder, argv->argv[i].tag, argv->argv[i].ca_str);
+				argv->argv[i].ca_str = NULL;
+			}
+			gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL, 0, 3, 3);
+			prop_data->widgets[i] = w;
+			break;
+		default:
+			g_assert_not_reached ();
+			break;
+		}
+		
+		row++;
+		l = l->next;
+	}
+	
+	prop_data->object = folder;
+	camel_object_ref (folder);
+	
+	camel_object_free (folder, CAMEL_FOLDER_PROPERTIES, list);
+	camel_object_free (folder, CAMEL_FOLDER_NAME, name);
+	
+	/* we do 'apply on ok' ... since instant apply may apply some very long running tasks */
+	
+	g_signal_connect (dialog, "response", G_CALLBACK (emfp_dialog_response), prop_data);
+	g_object_set_data_full ((GObject *) dialog, "e-prop-data", prop_data, emfp_dialog_free);
+	gtk_widget_show (dialog);
+}
+
+/**
+ * em_folder_properties_show:
+ * @parent: parent window for dialogue (currently unused)
+ * @folder: 
+ * @uri: 
+ * 
+ * Show folder properties for @folder and @uri.  If @folder is passed
+ * as NULL, then the folder @uri will be loaded first.
+ **/
+void
+em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const char *uri)
+{
+	/* HACK: its the old behaviour, not very 'neat' but it works */
+	if (!strncmp(uri, "vfolder:", 8))
+		vfolder_edit_rule(uri);
+	else if (folder == NULL)
+		mail_get_folder (uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new);
+	else
+		emfp_dialog_got_folder((char *)uri, folder, NULL);
+}
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
new file mode 100644
index 0000000000..3fed03fc2c
--- /dev/null
+++ b/mail/em-folder-properties.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Authors: Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __EM_FOLDER_PROPERTIES_H__
+#define __EM_FOLDER_PROPERTIES_H__
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+struct _CamelFolder;
+struct _GtkWindow;
+
+void em_folder_properties_show(struct _GtkWindow *parent, struct _CamelFolder *folder, const char *uri);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __EM_FOLDER_PROPERTIES_H__ */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 2aef2f7141..216c547ff8 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -60,7 +60,7 @@
 #include "em-folder-tree.h"
 #include "em-folder-selector.h"
 #include "em-folder-selection.h"
-
+#include "em-folder-properties.h"
 
 #define d(x) x
 
@@ -115,7 +115,6 @@ struct _emft_selection_data {
 
 static GtkVBoxClass *parent_class = NULL;
 
-
 GType
 em_folder_tree_get_type (void)
 {
@@ -1533,207 +1532,6 @@ emft_popup_rename_folder (GtkWidget *item, EMFolderTree *emft)
 	}
 }
 
-struct _prop_data {
-	void *object;
-	CamelArgV *argv;
-	GtkWidget **widgets;
-};
-
-static void
-emft_popup_properties_response (GtkWidget *dialog, int response, struct _prop_data *prop_data)
-{
-	CamelArgV *argv = prop_data->argv;
-	int i;
-	
-	if (response != GTK_RESPONSE_OK) {
-		gtk_widget_destroy (dialog);
-		return;
-	}
-	
-	for (i = 0; i < argv->argc; i++) {
-		CamelArg *arg = &argv->argv[i];
-		
-		switch (arg->tag & CAMEL_ARG_TYPE) {
-		case CAMEL_ARG_BOO:
-			arg->ca_int = gtk_toggle_button_get_active ((GtkToggleButton *) prop_data->widgets[i]);
-			break;
-		case CAMEL_ARG_STR:
-			g_free (arg->ca_str);
-			arg->ca_str = (char *) gtk_entry_get_text ((GtkEntry *) prop_data->widgets[i]);
-			break;
-		default:
-			g_assert_not_reached ();
-			break;
-		}
-	}
-	
-	camel_object_setv (prop_data->object, NULL, argv);
-	gtk_widget_destroy (dialog);
-}
-
-static void
-emft_popup_properties_free (void *data)
-{
-	struct _prop_data *prop_data = data;
-	int i;
-	
-	for (i = 0; i < prop_data->argv->argc; i++) {
-		if ((prop_data->argv->argv[i].tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR)
-			g_free (prop_data->argv->argv[i].ca_str);
-	}
-	
-	camel_object_unref (prop_data->object);
-	g_free (prop_data->argv);
-	g_free (prop_data);
-}
-
-static void
-emft_popup_properties_got_folder (char *uri, CamelFolder *folder, void *data)
-{
-	GtkWidget *dialog, *w, *table, *label;
-	struct _prop_data *prop_data;
-	CamelArgGetV *arggetv;
-	CamelArgV *argv;
-	GSList *list, *l;
-	gint32 count, i;
-	char *name;
-	char countstr[16];
-	int row = 0, total=0, unread=0;
-	
-	if (folder == NULL)
-		return;
-	
-	camel_object_get (folder, NULL, CAMEL_FOLDER_PROPERTIES, &list, CAMEL_FOLDER_NAME, &name,
-			  CAMEL_FOLDER_TOTAL, &total, CAMEL_FOLDER_UNREAD, &unread, NULL);
-	
-	dialog = gtk_dialog_new_with_buttons (_("Folder properties"), NULL,
-					      GTK_DIALOG_DESTROY_WITH_PARENT,
-					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
-	
-	/* TODO: maybe we want some basic properties here, like message counts/approximate size/etc */
-	w = gtk_frame_new (_("Properties"));
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, w, TRUE, TRUE, 6);
-	
-	table = gtk_table_new (g_slist_length (list) + 3, 2, FALSE);
-	gtk_widget_show (table);
-	gtk_container_add ((GtkContainer *) w, table);
-
-	/* TODO: can this be done in a loop? */
-	label = gtk_label_new (_("Folder Name"));
-	gtk_widget_show (label);
-	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
-	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
-	
-	label = gtk_label_new (name);
-	gtk_widget_show (label);
-	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
-	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
-	row++;
-
-	label = gtk_label_new (_("Total messages"));
-	gtk_widget_show (label);
-	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
-	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
-	
-	sprintf(countstr, "%d", total);
-	label = gtk_label_new (countstr);
-	gtk_widget_show (label);
-	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
-	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
-	row++;
-
-	label = gtk_label_new (_("Unread messages"));
-	gtk_widget_show (label);
-	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
-	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
-	
-	sprintf(countstr, "%d", unread);
-	label = gtk_label_new (countstr);
-	gtk_widget_show (label);
-	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
-	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 3, 0);
-	row++;
-
-	/* build an arggetv/argv to retrieve/store the results */
-	count = g_slist_length (list);
-	arggetv = g_malloc0 (sizeof (*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof (arggetv->argv[0]));
-	arggetv->argc = count;
-	argv = g_malloc0 (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]));
-	argv->argc = count;
-	
-	i = 0;
-	l = list;
-	while (l) {
-		CamelProperty *prop = l->data;
-		
-		argv->argv[i].tag = prop->tag;
-		arggetv->argv[i].tag = prop->tag;
-		arggetv->argv[i].ca_ptr = &argv->argv[i].ca_ptr;
-		
-		l = l->next;
-		i++;
-	}
-	
-	camel_object_getv (folder, NULL, arggetv);
-	g_free (arggetv);
-	
-	prop_data = g_malloc0 (sizeof (*prop_data));
-	prop_data->widgets = g_malloc0 (sizeof (prop_data->widgets[0]) * count);
-	prop_data->argv = argv;
-	
-	/* setup the ui with the values retrieved */
-	l = list;
-	i = 0;
-	while (l) {
-		CamelProperty *prop = l->data;
-		
-		switch (prop->tag & CAMEL_ARG_TYPE) {
-		case CAMEL_ARG_BOO:
-			w = gtk_check_button_new_with_label (prop->description);
-			gtk_toggle_button_set_active ((GtkToggleButton *) w, argv->argv[i].ca_int != 0);
-			gtk_widget_show (w);
-			gtk_table_attach ((GtkTable *) table, w, 0, 2, row, row + 1, 0, 0, 3, 3);
-			prop_data->widgets[i] = w;
-			break;
-		case CAMEL_ARG_STR:
-			label = gtk_label_new (prop->description);
-			gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
-			gtk_widget_show (label);
-			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 3, 3);
-			
-			w = gtk_entry_new ();
-			gtk_widget_show (w);
-			if (argv->argv[i].ca_str) {
-				gtk_entry_set_text ((GtkEntry *) w, argv->argv[i].ca_str);
-				camel_object_free (folder, argv->argv[i].tag, argv->argv[i].ca_str);
-				argv->argv[i].ca_str = NULL;
-			}
-			gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL, 0, 3, 3);
-			prop_data->widgets[i] = w;
-			break;
-		default:
-			g_assert_not_reached ();
-			break;
-		}
-		
-		row++;
-		l = l->next;
-	}
-	
-	prop_data->object = folder;
-	camel_object_ref (folder);
-	
-	camel_object_free (folder, CAMEL_FOLDER_PROPERTIES, list);
-	camel_object_free (folder, CAMEL_FOLDER_NAME, name);
-	
-	/* we do 'apply on ok' ... since instant apply may apply some very long running tasks */
-	
-	g_signal_connect (dialog, "response", G_CALLBACK (emft_popup_properties_response), prop_data);
-	g_object_set_data_full ((GObject *) dialog, "e-prop-data", prop_data, emft_popup_properties_free);
-	gtk_widget_show (dialog);
-}
 
 static void
 emft_popup_properties (GtkWidget *item, EMFolderTree *emft)
@@ -1747,8 +1545,8 @@ emft_popup_properties (GtkWidget *item, EMFolderTree *emft)
 	selection = gtk_tree_view_get_selection (priv->treeview);
 	emft_selection_get_selected (selection, &model, &iter);
 	gtk_tree_model_get (model, &iter, COL_STRING_URI, &uri, -1);
-	
-	mail_get_folder (uri, 0, emft_popup_properties_got_folder, emft, mail_thread_new);
+
+	em_folder_properties_show(NULL, NULL, uri);
 }
 
 static EMPopupItem emft_popup_menu[] = {