From 21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 21 Oct 2003 18:51:30 +0000 Subject: Merge new-ui-branch into the trunk. svn path=/trunk/; revision=22966 --- filter/filter-folder.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'filter/filter-folder.c') diff --git a/filter/filter-folder.c b/filter/filter-folder.c index e074c31f6c..c19584484d 100644 --- a/filter/filter-folder.c +++ b/filter/filter-folder.c @@ -31,7 +31,8 @@ #include #include "filter-folder.h" -#include "shell/evolution-folder-selector-button.h" +#include "mail/em-folder-selection-button.h" +#include "mail/mail-component.h" #include "e-util/e-sexp.h" #define d(x) @@ -53,9 +54,6 @@ static void filter_folder_finalise (GObject *obj); static FilterElementClass *parent_class = NULL; -extern EvolutionShellClient *global_shell_client; - - GType filter_folder_get_type (void) { @@ -222,12 +220,13 @@ xml_decode (FilterElement *fe, xmlNodePtr node) } static void -folder_selected (EvolutionFolderSelectorButton *button, - GNOME_Evolution_Folder *folder, - FilterFolder *ff) +folder_selected(EMFolderSelectionButton *button, FilterFolder *ff) { - g_free (ff->uri); - ff->uri = g_strdup (folder->physicalUri); + const char *uri; + + uri = em_folder_selection_button_get_selection(button); + g_free(ff->uri); + ff->uri = uri!=NULL?em_uri_from_camel(uri):NULL; gdk_window_raise (GTK_WIDGET (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW))->window); } @@ -235,14 +234,14 @@ folder_selected (EvolutionFolderSelectorButton *button, static GtkWidget * get_widget (FilterElement *fe) { - static const char *allowed_types[] = { "mail/*", NULL }; FilterFolder *ff = (FilterFolder *)fe; GtkWidget *button; - - button = evolution_folder_selector_button_new (global_shell_client, - _("Select Folder"), - ff->uri, - allowed_types); + char *uri; + + uri = em_uri_to_camel(ff->uri); + button = em_folder_selection_button_new (_("Select Folder"), NULL); + em_folder_selection_button_set_selection(EM_FOLDER_SELECTION_BUTTON(button), uri); + g_free(uri); gtk_widget_show (button); g_signal_connect (button, "selected", G_CALLBACK (folder_selected), ff); -- cgit v1.2.3