Merge new-ui-branch into the trunk.

svn path=/trunk/; revision=22966

4 files changed, 60 insertions, 40 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index abcaad596c..0506227e66 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-10  Not Zed  <NotZed@Ximian.com>
+
+	* filter-folder.c (folder_selected): change for
+	emfolderselectionbutton fixes.
+	(get_widget): same.
+
+2003-09-29  Ettore Perazzoli  <ettore@ximian.com>
+
+	* filter-folder.c (get_widget): Use an EMFolderSelectionButton.
+
 2003-09-22  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* filter-int.c (get_widget): Listen to the "value-changed" signal
@@ -24,6 +34,15 @@
 	* searchtypes.xml: Added a search-specific types folder.  Also
 	contains system searches that cannot be deleted.
 
+2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
+
+	* vfolder-rule.c (source_add): As a temporary measure, don't call
+	evolution_shell_client_user_select_folder() since this is not done
+	by the shell anymore.
+
+	* filter-folder.c (get_widget): Return NULL for now, since we
+	can't get the folder selector button from the shell anymore.
+
 2003-08-05  Not Zed  <NotZed@Ximian.com>
 
 	** See bug #42636.
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 <libgnome/gnome-i18n.h>
 
 #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);
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index d965e03184..ea7ff03b0e 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -4,34 +4,17 @@ char *s = N_("Assign Color");
 char *s = N_("Assign Score");
 char *s = N_("Attachments");
 char *s = N_("Beep");
-char *s = N_("contains");
 char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
 char *s = N_("Deleted");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not return");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
 char *s = N_("Do Not Exist");
 char *s = N_("Draft");
-char *s = N_("ends with");
 char *s = N_("Exist");
-char *s = N_("exists");
 char *s = N_("Expression");
 char *s = N_("Follow Up");
 char *s = N_("Important");
-char *s = N_("is");
-char *s = N_("is after");
-char *s = N_("is before");
-char *s = N_("is Flagged");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-char *s = N_("is not Flagged");
 char *s = N_("Label");
 char *s = N_("Mailing list");
 char *s = N_("Message Body");
@@ -43,19 +26,36 @@ char *s = N_("Read");
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
 char *s = N_("Replied to");
-char *s = N_("returns");
-char *s = N_("returns greater than");
-char *s = N_("returns less than");
 char *s = N_("Score");
 char *s = N_("Sender");
 char *s = N_("Set Status");
 char *s = N_("Shell Command");
 char *s = N_("Size (kB)");
-char *s = N_("sounds like");
 char *s = N_("Source Account");
 char *s = N_("Specific header");
-char *s = N_("starts with");
 char *s = N_("Status");
 char *s = N_("Stop Processing");
 char *s = N_("Subject");
 char *s = N_("Unset Status");
+char *s = N_("contains");
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not return");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+char *s = N_("is Flagged");
+char *s = N_("is after");
+char *s = N_("is before");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not Flagged");
+char *s = N_("is not");
+char *s = N_("is");
+char *s = N_("returns greater than");
+char *s = N_("returns less than");
+char *s = N_("returns");
+char *s = N_("sounds like");
+char *s = N_("starts with");
diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
index 26d024c525..91ad0b151c 100644
--- a/filter/vfolder-rule.c
+++ b/filter/vfolder-rule.c
@@ -46,8 +46,6 @@ static void rule_copy (FilterRule *dest, FilterRule *src);
 /*static void build_code(FilterRule *, GString *out);*/
 static GtkWidget *get_widget(FilterRule *fr, RuleContext *f);
 
-extern EvolutionShellClient *global_shell_client;
-
 static void vfolder_rule_class_init (VfolderRuleClass *klass);
 static void vfolder_rule_init (VfolderRule *vr);
 static void vfolder_rule_finalise (GObject *obj);
@@ -433,9 +431,13 @@ source_add (GtkWidget *widget, struct _source_data *data)
 	
 	window = gtk_widget_get_toplevel (widget);
 	gtk_widget_set_sensitive (window, FALSE);
-	
+
+#if 0				/* EPFIXME */
 	evolution_shell_client_user_select_folder (global_shell_client, GTK_WINDOW (window),
 						   _("Select Folder"), "", allowed_types, &folder);
+#else
+	folder = NULL;
+#endif
 	
 	gtk_widget_set_sensitive (window, TRUE);