Get the mail folder tree compiling, though I'm not yet sure why it's not

showing anything.  Probably something stupid.  Also enabled the composer.

svn path=/branches/kill-bonobo/; revision=36623

1 files changed, 9 insertions, 5 deletions

diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 2943772b68..36cf8768ff 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -40,9 +40,8 @@
 
 #include <camel/camel-exception.h>
 
+#include "mail/e-mail-shell-module.h"
 #include "mail/em-folder-selection-button.h"
-
-#include "mail/mail-component.h"
 #include "mail/mail-mt.h"
 
 #include "mail-importer.h"
@@ -73,15 +72,20 @@ static GtkWidget *
 mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWidget *hbox, *w;
+	EMFolderTreeModel *model;
+	const gchar *local_inbox_folder_uri;
+
+	local_inbox_folder_uri = e_mail_shell_module_get_folder_uri (
+		mail_shell_module, E_MAIL_FOLDER_INBOX);
+	model = e_mail_shell_module_get_folder_tree_model (mail_shell_module);
 
 	hbox = gtk_hbox_new(FALSE, 0);
 
 	w = gtk_label_new(_("Destination folder:"));
 	gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6);
 
-	w = em_folder_selection_button_new(_("Select folder"), _("Select folder to import into"));
-	em_folder_selection_button_set_selection((EMFolderSelectionButton *)w,
-						 mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_INBOX));
+	w = em_folder_selection_button_new(model, _("Select folder"), _("Select folder to import into"));
+	em_folder_selection_button_set_selection((EMFolderSelectionButton *)w, local_inbox_folder_uri);
 	g_signal_connect(w, "selected", G_CALLBACK(folder_selected), target);
 	gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6);