Bug 488409 - Remember size of filter/vfolder editor windows

6 files changed, 296 insertions, 177 deletions

diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 8d720742c6..b782ca8cbf 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -29,68 +29,79 @@
 #include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
+#include "e-util/gconf-bridge.h"
 
 #include "em-filter-editor.h"
 #include "em-filter-rule.h"
 
-#define d(x)
+static gpointer parent_class;
 
-static FilterRule *create_rule (RuleEditor *re);
-
-static void em_filter_editor_class_init (EMFilterEditorClass *klass);
-static void em_filter_editor_init (EMFilterEditor *fe);
-static void em_filter_editor_finalise (GObject *obj);
-
-static RuleEditorClass *parent_class = NULL;
-
-GType
-em_filter_editor_get_type (void)
+static FilterRule *
+filter_editor_create_rule (RuleEditor *rule_editor)
 {
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (EMFilterEditorClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc) em_filter_editor_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (EMFilterEditor),
-			0,    /* n_preallocs */
-			(GInstanceInitFunc) em_filter_editor_init,
-		};
+	FilterRule *rule = filter_rule_new ();
+	FilterPart *part;
 
-		type = g_type_register_static (RULE_TYPE_EDITOR, "EMFilterEditor", &info, 0);
-	}
+	/* create a rule with 1 part & 1 action in it */
+	rule = (FilterRule *)em_filter_rule_new ();
+	part = rule_context_next_part (rule_editor->context, NULL);
+	filter_rule_add_part (rule, filter_part_clone (part));
+	part = em_filter_context_next_action (
+		(EMFilterContext *)rule_editor->context, NULL);
+	em_filter_rule_add_action (
+		(EMFilterRule *)rule, filter_part_clone (part));
 
-	return type;
+	return rule;
 }
 
 static void
-em_filter_editor_class_init (EMFilterEditorClass *klass)
+filter_editor_class_init (EMFilterEditorClass *class)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	RuleEditorClass *re_class = (RuleEditorClass *) klass;
-
-	parent_class = g_type_class_ref (rule_editor_get_type ());
+	RuleEditorClass *rule_editor_class;
 
-	gobject_class->finalize = em_filter_editor_finalise;
+	parent_class = g_type_class_peek_parent (class);
 
-	/* override methods */
-	re_class->create_rule = create_rule;
+	rule_editor_class = RULE_EDITOR_CLASS (class);
+	rule_editor_class->create_rule = filter_editor_create_rule;
 }
 
 static void
-em_filter_editor_init (EMFilterEditor *fe)
+filter_editor_init (EMFilterEditor *filter_editor)
 {
-	;
+	GConfBridge *bridge;
+	const gchar *key_prefix;
+
+	bridge = gconf_bridge_get ();
+	key_prefix = "/apps/evolution/mail/filter_editor";
+
+	gconf_bridge_bind_window_size (
+		bridge, key_prefix, GTK_WINDOW (filter_editor));
 }
 
-static void
-em_filter_editor_finalise (GObject *obj)
+GType
+em_filter_editor_get_type (void)
 {
-        G_OBJECT_CLASS (parent_class)->finalize (obj);
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (EMFilterEditorClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) filter_editor_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (EMFilterEditor),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) filter_editor_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			RULE_TYPE_EDITOR, "EMFilterEditor", &type_info, 0);
+	}
+
+	return type;
 }
 
 /**
@@ -101,15 +112,17 @@ em_filter_editor_finalise (GObject *obj)
  * Return value: A new #EMFilterEditor object.
  **/
 EMFilterEditor *
-em_filter_editor_new (EMFilterContext *fc, const EMFilterSource *source_names)
+em_filter_editor_new (EMFilterContext *fc,
+                      const EMFilterSource *source_names)
 {
-	EMFilterEditor *fe = (EMFilterEditor *) g_object_new (em_filter_editor_get_type(), NULL);
+	EMFilterEditor *fe;
 	GladeXML *gui;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "filter.glade",
-				      NULL);
+	fe = g_object_new (EM_TYPE_FILTER_EDITOR, NULL);
+
+	gladefile = g_build_filename (
+		EVOLUTION_GLADEDIR, "filter.glade", NULL);
 	gui = glade_xml_new (gladefile, "rule_editor", NULL);
 	g_free (gladefile);
 
@@ -149,7 +162,10 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe)
 }
 
 void
-em_filter_editor_construct (EMFilterEditor *fe, EMFilterContext *fc, GladeXML *gui, const EMFilterSource *source_names)
+em_filter_editor_construct (EMFilterEditor *fe,
+                            EMFilterContext *fc,
+                            GladeXML *gui,
+                            const EMFilterSource *source_names)
 {
 	GtkWidget *combobox;
 	gint i;
@@ -175,19 +191,3 @@ em_filter_editor_construct (EMFilterEditor *fe, EMFilterContext *fc, GladeXML *g
 	column = gtk_tree_view_get_column (GTK_TREE_VIEW (RULE_EDITOR (fe)->list), 0);
 	gtk_tree_view_column_set_visible (column, TRUE);
 }
-
-static FilterRule *
-create_rule (RuleEditor *re)
-{
-	FilterRule *rule = filter_rule_new ();
-	FilterPart *part;
-
-	/* create a rule with 1 part & 1 action in it */
-	rule = (FilterRule *)em_filter_rule_new ();
-	part = rule_context_next_part (re->context, NULL);
-	filter_rule_add_part (rule, filter_part_clone (part));
-	part = em_filter_context_next_action ((EMFilterContext *)re->context, NULL);
-	em_filter_rule_add_action ((EMFilterRule *)rule, filter_part_clone (part));
-
-	return rule;
-}
diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h
index 8d9926b873..c725fd97b5 100644
--- a/mail/em-filter-editor.h
+++ b/mail/em-filter-editor.h
@@ -22,17 +22,32 @@
  *
  */
 
-#ifndef _EM_FILTER_EDITOR_H
-#define _EM_FILTER_EDITOR_H
+#ifndef EM_FILTER_EDITOR_H
+#define EM_FILTER_EDITOR_H
 
 #include "filter/rule-editor.h"
 #include "em-filter-context.h"
 
-#define EM_FILTER_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), em_filter_editor_get_type(), EMFilterEditor))
-#define EM_FILTER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), em_filter_editor_get_type(), EMFilterEditorClass))
-#define EM_IS_FILTER_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_filter_editor_get_type()))
-#define EM_IS_FILTER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_filter_editor_get_type()))
-#define EM_FILTER_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), em_filter_editor_get_type(), EMFilterEditorClass))
+/* Standard GObject macros */
+#define EM_TYPE_FILTER_EDITOR \
+	(em_filter_editor_get_type ())
+#define EM_FILTER_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_FILTER_EDITOR, EMFilterEditor))
+#define EM_FILTER_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_FILTER_EDITOR, EMFilterEditorClass))
+#define EM_IS_FILTER_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_FILTER_EDITOR))
+#define EM_IS_FILTER_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_FILTER_EDITOR))
+#define EM_FILTER_EDITOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_FILTER_EDITOR, EMFilterEditorClass))
+
+G_BEGIN_DECLS
 
 typedef struct _EMFilterEditor EMFilterEditor;
 typedef struct _EMFilterEditorClass EMFilterEditorClass;
@@ -45,16 +60,19 @@ struct _EMFilterSource {
 };
 
 struct _EMFilterEditor {
-	RuleEditor parent_object;
+	RuleEditor parent;
 };
 
 struct _EMFilterEditorClass {
 	RuleEditorClass parent_class;
 };
 
-GType em_filter_editor_get_type (void);
-
-EMFilterEditor *em_filter_editor_new (EMFilterContext *f, const EMFilterSource *source_names);
-void em_filter_editor_construct (EMFilterEditor *fe, EMFilterContext *fc, GladeXML *gui, const EMFilterSource *source_names);
+GType		em_filter_editor_get_type	(void);
+EMFilterEditor *em_filter_editor_new		(EMFilterContext *f,
+						 const EMFilterSource *source_names);
+void		em_filter_editor_construct	(EMFilterEditor *fe,
+						 EMFilterContext *fc,
+						 GladeXML *gui,
+						 const EMFilterSource *source_names);
 
-#endif /* ! _EM_FILTER_EDITOR_H */
+#endif /* EM_FILTER_EDITOR_H */
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 84acd5f293..058ad0a957 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -31,40 +31,49 @@
 #include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
+#include "e-util/gconf-bridge.h"
 
 #include "em-vfolder-editor.h"
 #include "em-vfolder-rule.h"
 
-#define d(x)
+static gpointer parent_class;
 
-static FilterRule *create_rule (RuleEditor *re);
+static FilterRule *
+vfolder_editor_create_rule (RuleEditor *rule_editor)
+{
+	FilterRule *rule = filter_rule_new ();
+	FilterPart *part;
 
-static RuleEditorClass *parent_class = NULL;
+	/* create a rule with 1 part in it */
+	rule = (FilterRule *) em_vfolder_rule_new ();
+	part = rule_context_next_part (rule_editor->context, NULL);
+	filter_rule_add_part (rule, filter_part_clone (part));
 
-static void
-em_vfolder_editor_finalise (GObject *obj)
-{
-        G_OBJECT_CLASS (parent_class)->finalize (obj);
+	return rule;
 }
 
 static void
-em_vfolder_editor_class_init (EMVFolderEditorClass *klass)
+vfolder_editor_class_init (EMVFolderEditorClass *class)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	RuleEditorClass *re_class = (RuleEditorClass *) klass;
+	RuleEditorClass *rule_editor_class;
 
-	parent_class = g_type_class_ref (rule_editor_get_type ());
+	parent_class = g_type_class_peek_parent (class);
 
-	gobject_class->finalize = em_vfolder_editor_finalise;
-
-	/* override methods */
-	re_class->create_rule = create_rule;
+	rule_editor_class = RULE_EDITOR_CLASS (class);
+	rule_editor_class->create_rule = vfolder_editor_create_rule;
 }
 
 static void
-em_vfolder_editor_init (EMVFolderEditor *ve)
+vfolder_editor_init (EMVFolderEditor *vfolder_editor)
 {
-	;
+	GConfBridge *bridge;
+	const gchar *key_prefix;
+
+	bridge = gconf_bridge_get ();
+	key_prefix = "/apps/evolution/mail/vfolder_editor";
+
+	gconf_bridge_bind_window_size (
+		bridge, key_prefix, GTK_WINDOW (vfolder_editor));
 }
 
 GType
@@ -72,20 +81,22 @@ em_vfolder_editor_get_type (void)
 {
 	static GType type = 0;
 
-	if (!type) {
-		static const GTypeInfo info = {
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
 			sizeof (EMVFolderEditorClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc) em_vfolder_editor_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) vfolder_editor_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
 			sizeof (EMVFolderEditor),
-			0,    /* n_preallocs */
-			(GInstanceInitFunc) em_vfolder_editor_init,
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) vfolder_editor_init,
+			NULL   /* value_table */
 		};
 
-		type = g_type_register_static (RULE_TYPE_EDITOR, "EMVFolderEditor", &info, 0);
+		type = g_type_register_static (
+			RULE_TYPE_EDITOR, "EMVFolderEditor", &type_info, 0);
 	}
 
 	return type;
@@ -101,13 +112,14 @@ em_vfolder_editor_get_type (void)
 GtkWidget *
 em_vfolder_editor_new (EMVFolderContext *vc)
 {
-	EMVFolderEditor *ve = (EMVFolderEditor *) g_object_new (em_vfolder_editor_get_type(), NULL);
+	EMVFolderEditor *ve;
 	GladeXML *gui;
 	gchar *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "filter.glade",
-				      NULL);
+	ve = g_object_new (EM_TYPE_VFOLDER_EDITOR, NULL);
+
+	gladefile = g_build_filename (
+		EVOLUTION_GLADEDIR, "filter.glade", NULL);
 	gui = glade_xml_new (gladefile, "rule_editor", NULL);
 	g_free (gladefile);
 
@@ -118,17 +130,3 @@ em_vfolder_editor_new (EMVFolderContext *vc)
 
 	return GTK_WIDGET (ve);
 }
-
-static FilterRule *
-create_rule (RuleEditor *re)
-{
-	FilterRule *rule = filter_rule_new ();
-	FilterPart *part;
-
-	/* create a rule with 1 part in it */
-	rule = (FilterRule *) em_vfolder_rule_new ();
-	part = rule_context_next_part (re->context, NULL);
-	filter_rule_add_part (rule, filter_part_clone (part));
-
-	return rule;
-}
diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h
index 550f7cd2d3..2a48c46e87 100644
--- a/mail/em-vfolder-editor.h
+++ b/mail/em-vfolder-editor.h
@@ -21,32 +21,47 @@
  *
  */
 
-#ifndef _EM_VFOLDER_EDITOR_H
-#define _EM_VFOLDER_EDITOR_H
+#ifndef EM_VFOLDER_EDITOR_H
+#define EM_VFOLDER_EDITOR_H
 
 #include "filter/rule-editor.h"
 #include "em-vfolder-context.h"
 
-#define EM_VFOLDER_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), em_vfolder_editor_get_type(), EMVFolderEditor))
-#define EM_VFOLDER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), em_vfolder_editor_get_type(), EMVFolderEditorClass))
-#define EM_IS_VFOLDER_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_vfolder_editor_get_type()))
-#define EM_IS_VFOLDER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_vfolder_editor_get_type()))
-#define EM_VFOLDER_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), em_vfolder_editor_get_type(), EMVFolderEditorClass))
+/* Standard GObject macros */
+#define EM_TYPE_VFOLDER_EDITOR \
+	(em_vfolder_editor_get_type ())
+#define EM_VFOLDER_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_VFOLDER_EDITOR, EMVFolderEditor))
+#define EM_VFOLDER_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_VFOLDER_EDITOR, EMVFolderEditorClass))
+#define EM_IS_VFOLDER_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_VFOLDER_EDITOR))
+#define EM_IS_VFOLDER_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_VFOLDER_EDITOR))
+#define EM_VFOLDER_EDITOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_VFOLDER_EDITOR, EMVFolderEditorClass))
+
+G_BEGIN_DECLS
 
 typedef struct _EMVFolderEditor EMVFolderEditor;
 typedef struct _EMVFolderEditorClass EMVFolderEditorClass;
 
 struct _EMVFolderEditor {
-	RuleEditor parent_object;
-
+	RuleEditor parent;
 };
 
 struct _EMVFolderEditorClass {
 	RuleEditorClass parent_class;
 };
 
-GType em_vfolder_editor_get_type (void);
+GType		em_vfolder_editor_get_type	(void);
+GtkWidget *	em_vfolder_editor_new		(EMVFolderContext *vc);
 
-GtkWidget *em_vfolder_editor_new (EMVFolderContext *vc);
+G_END_DECLS
 
-#endif /* ! _EM_VFOLDER_EDITOR_H */
+#endif /* EM_VFOLDER_EDITOR_H */
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index b42a5446c2..d6483110c7 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -26,7 +26,7 @@
       <locale name="C">
          <short>Spell check inline</short>
          <long>
-	 Draw spelling error indicators on words as you type.
+         Draw spelling error indicators on words as you type.
          </long>
       </locale>
     </schema>
@@ -40,7 +40,7 @@
       <locale name="C">
          <short>Automatic link recognition</short>
          <long>
-	 Recognize links in text and replace them.
+         Recognize links in text and replace them.
          </long>
       </locale>
     </schema>
@@ -54,7 +54,7 @@
       <locale name="C">
          <short>Automatic emoticon recognition</short>
          <long>
-	 Recognize emoticons in text and replace them with images.
+         Recognize emoticons in text and replace them with images.
          </long>
       </locale>
     </schema>
@@ -82,7 +82,7 @@
       <locale name="C">
          <short>Always request read receipt</short>
          <long>
-	 Whether a read receipt request gets added to every message by default.
+         Whether a read receipt request gets added to every message by default.
          </long>
       </locale>
     </schema>
@@ -364,7 +364,7 @@
       <locale name="C">
          <short>Enable/disable caret mode</short>
          <long>
-	  Enable caret mode, so that you can see a cursor when reading mail.
+          Enable caret mode, so that you can see a cursor when reading mail.
          </long>
       </locale>
     </schema>
@@ -525,7 +525,7 @@
       <locale name="C">
          <short>Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view.</short>
          <long> 
-	 Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view.
+         Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view.
          </long>
       </locale>
     </schema>
@@ -656,7 +656,7 @@
       <locale name="C">
          <short>Variable width font</short>
          <long>
-	 The variable width font for mail display.
+         The variable width font for mail display.
          </long>
       </locale>
     </schema>
@@ -670,7 +670,7 @@
       <locale name="C">
          <short>Terminal font</short>
          <long>
-	 The terminal font for mail display.
+         The terminal font for mail display.
          </long>
       </locale>
     </schema>
@@ -684,7 +684,7 @@
       <locale name="C">
          <short>Use custom fonts</short>
          <long>
-	 Use custom fonts for displaying mail.
+         Use custom fonts for displaying mail.
          </long>
       </locale>
     </schema>
@@ -712,8 +712,8 @@
       <locale name="C">
          <short>Compress display of addresses in TO/CC/BCC</short>
          <long>
-	 Compress display of addresses in TO/CC/BCC to the number 
-	 specified in address_count.
+         Compress display of addresses in TO/CC/BCC to the number 
+         specified in address_count.
          </long>
       </locale>
     </schema>
@@ -727,7 +727,7 @@
       <locale name="C">
          <short>Allows Evolution to display text part of limited size</short>
          <long>
-	 Enable to render message text part of limited size.
+         Enable to render message text part of limited size.
          </long>
       </locale>
     </schema>
@@ -741,9 +741,9 @@
       <locale name="C">
          <short>Text message part limit</short>
          <long>
-	 This decides the max size of the text part that can be formatted under
-	 Evolution. The default is 4MB / 4096 KB and is specified in terms of KB.
-	 </long>
+         This decides the max size of the text part that can be formatted under
+         Evolution. The default is 4MB / 4096 KB and is specified in terms of KB.
+         </long>
       </locale>
     </schema>
 
@@ -757,7 +757,7 @@
          <short>Number of addresses to display in TO/CC/BCC</short>
          <long>
          This sets the number of addresses to show in default message list
-	 view, beyond which a '...' is shown.
+         view, beyond which a '...' is shown.
          </long>
       </locale>
     </schema>
@@ -786,8 +786,8 @@
       <locale name="C">
          <short>Default value for thread expand state</short>
          <long>
-	  This setting specifies whether the threads should be in expanded
-	  or collapsed state by default. Evolution requires a restart.
+          This setting specifies whether the threads should be in expanded
+          or collapsed state by default. Evolution requires a restart.
          </long>
       </locale>
     </schema>
@@ -801,9 +801,9 @@
       <locale name="C">
          <short>Whether sort threads based on latest message in that thread</short>
          <long>
-	  This setting specifies whether the threads should be sorted based
-	  on latest message in each thread, rather than by message's date.
-	  Evolution requires a restart.
+          This setting specifies whether the threads should be sorted based
+          on latest message in each thread, rather than by message's date.
+          Evolution requires a restart.
          </long>
       </locale>
     </schema>
@@ -1015,8 +1015,8 @@
       <locale name="C">
          <short>Prompt when user tries to open 10 or more messages at once</short>
          <long>
-	  If a user tries to open 10 or more messages at one time, ask the user
-	  if they really want to do it.
+          If a user tries to open 10 or more messages at one time, ask the user
+          if they really want to do it.
          </long>
       </locale>
     </schema>
@@ -1030,7 +1030,7 @@
       <locale name="C">
          <short>Prompt while marking multiple messages</short>
          <long>
-	Enable or disable the prompt whilst marking multiple messages.
+        Enable or disable the prompt whilst marking multiple messages.
          </long>
       </locale>
     </schema>
@@ -1044,8 +1044,8 @@
       <locale name="C">
          <short>Prompt to check if the user wants to go offline immediately </short>
          <long>
-	 It disables/enables the repeated prompts to ask if offline 
-	 sync is required before going into offline mode.
+         It disables/enables the repeated prompts to ask if offline 
+         sync is required before going into offline mode.
          </long>
       </locale>
     </schema>
@@ -1059,9 +1059,9 @@
       <locale name="C">
          <short>Prompt when deleting messages in search folder</short>
          <long>
-	 It disables/enables the repeated prompts to warn that deleting
-	 messages from a search folder permanently deletes the message, not
-	 simply removing it from the search results.
+         It disables/enables the repeated prompts to warn that deleting
+         messages from a search folder permanently deletes the message, not
+         simply removing it from the search results.
          </long>
       </locale>
     </schema>
@@ -1091,7 +1091,7 @@
       <locale name="C">
          <short>Minimum days between emptying the trash on exit</short>
          <long>
-	Minimum time between emptying the trash on exit, in days.
+        Minimum time between emptying the trash on exit, in days.
          </long>
       </locale>
     </schema>
@@ -1105,7 +1105,7 @@
       <locale name="C">
          <short>Last time empty trash was run</short>
          <long>
-	The last time empty trash was run, in days since the epoch.
+        The last time empty trash was run, in days since the epoch.
          </long>
       </locale>
     </schema>
@@ -1119,7 +1119,7 @@
       <locale name="C">
          <short>Amount of time in seconds the error should be shown on the status bar.</short>
          <long>
-	Amount of time in seconds the error should be shown on the status bar.
+        Amount of time in seconds the error should be shown on the status bar.
          </long>
       </locale>
     </schema>
@@ -1197,7 +1197,7 @@
       <locale name="C">
          <short>Minimum days between emptying the junk on exit</short>
          <long>
-	Minimum time between emptying the junk on exit, in days.
+        Minimum time between emptying the junk on exit, in days.
          </long>
       </locale>
     </schema>
@@ -1211,7 +1211,7 @@
       <locale name="C">
          <short>Last time empty junk was run</short>
          <long>
-	The last time empty junk was run, in days since the epoch.
+        The last time empty junk was run, in days since the epoch.
          </long>
       </locale>
     </schema>
@@ -1226,8 +1226,8 @@
          <short>The default plugin for Junk hook</short>
          <long>
           This is the default junk plugin, even though there are multiple plugins
-	  enabled. If the default listed plugin is disabled, then it won't fall back
-	  to the other available plugins.
+          enabled. If the default listed plugin is disabled, then it won't fall back
+          to the other available plugins.
          </long>
       </locale>
     </schema>
@@ -1240,10 +1240,10 @@
       <default>true</default>
       <locale name="C">
          <short>Use only local spam tests.</short>
-	 <long>
-	 Use only the local spam tests (no DNS).
-	 </long>
-      </locale>	
+         <long>
+         Use only the local spam tests (no DNS).
+         </long>
+      </locale>        
     </schema>
 
     <schema>
@@ -1269,7 +1269,7 @@
       <locale name="C">
          <short>Determines whether to lookup in address book for sender email</short>
          <long>
-	 Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion.
+         Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion.
          </long>
       </locale>
     </schema>
@@ -1283,7 +1283,7 @@
       <locale name="C">
          <short>Determines whether to look up addresses for junk filtering in local address book only</short>
          <long>
-	 This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering.
+         This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering.
          </long>
       </locale>
     </schema>
@@ -1311,7 +1311,7 @@
       <locale name="C">
          <short>Custom headers to use while checking for junk.</short>
          <long>
-	 Custom headers to use while checking for junk. The list elements
+         Custom headers to use while checking for junk. The list elements
          are string in the format "headername=value".
          </long>
       </locale>
@@ -1392,6 +1392,50 @@
     <!-- Widget States -->
 
     <schema>
+      <key>/schemas/apps/evolution/mail/filter_editor_height</key>
+      <applyto>/apps/evolution/mail/filter_editor_height</applyto>
+      <type>int</type>
+      <default>650</default>
+      <locale name="C">
+        <short>"Filter Editor" window height</short>
+        <long>
+          Initial height of the "Filter Editor" window.
+          The value updates as the user resizes the window vertically.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/filter_editor_maximized</key>
+      <applyto>/apps/evolution/mail/filter_editor_maximized</applyto>
+      <type>bool</type>
+      <locale name="C">
+        <short>"Filter Editor" window maximize state</short>
+        <long>
+          Initial maximize state of the "Filter Editor" window.
+          The value updates when the user maximizes or unmaximizes the
+          window.  Note, this particular value is not used by Evolution
+          since the "Filter Editor" window cannot be maximized.  This
+          key exists only as an implementation detail.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/filter_editor_width</key>
+      <applyto>/apps/evolution/mail/filter_editor_width</applyto>
+      <type>int</type>
+      <default>400</default>
+      <locale name="C">
+        <short>"Filter Editor" window width</short>
+        <long>
+          Initial width of the "Filter Editor" window.
+          The value updates as the user resizes the window horizontally.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/evolution/mail/send_recv_height</key>
       <applyto>/apps/evolution/mail/send_recv_height</applyto>
       <owner>evolution-mail</owner>
@@ -1438,6 +1482,50 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/vfolder_editor_height</key>
+      <applyto>/apps/evolution/mail/vfolder_editor_height</applyto>
+      <type>int</type>
+      <default>650</default>
+      <locale name="C">
+        <short>"Search Folder Editor" window height</short>
+        <long>
+          Initial height of the "Search Folder Editor" window.
+          The value updates as the user resizes the window vertically.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/vfolder_editor_maximized</key>
+      <applyto>/apps/evolution/mail/vfolder_editor_maximized</applyto>
+      <type>bool</type>
+      <locale name="C">
+        <short>"Search Folder Editor" window maximize state</short>
+        <long>
+          Initial maximize state of the "Search Folder Editor" window.
+          The value updates when the user maximizes or unmaximizes the
+          window.  Note, this particular value is not used by Evolution
+          since the "Search Folder Editor" window cannot be maximized.
+          This key exists only as an implementation detail.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/vfolder_editor_width</key>
+      <applyto>/apps/evolution/mail/vfolder_editor_width</applyto>
+      <type>int</type>
+      <default>400</default>
+      <locale name="C">
+        <short>"Search Folder Editor" window width</short>
+        <long>
+          Initial width of the "Search Folder Editor" window.
+          The value updates as the user resizes the window horizontally.
+        </long>
+      </locale>
+    </schema>
+
     <!-- Others -->
 
     <schema>
diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in
index 3f97072583..157df8cb9e 100644
--- a/shell/apps_evolution_shell.schemas.in
+++ b/shell/apps_evolution_shell.schemas.in
@@ -60,7 +60,7 @@
 
     <schema>
       <key>/schemas/apps/evolution/shell/current_folder</key>
-      <applyto>/apps/evolution/shell/current-folder</applyto>
+      <applyto>/apps/evolution/shell/current_folder</applyto>
       <owner>evolution</owner>
       <type>string</type>
       <locale name="C">