Fix a crapload of run-time warnings.

EConfig and EMAccountEditor are very, very brittle.

10 files changed, 225 insertions, 89 deletions

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 179dd25ca2..bf59e37fb9 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -579,7 +579,7 @@ static ECalConfigItem eccp_items[] = {
 	{ E_CONFIG_SECTION,       (gchar *) "10.display/10.taskList",       (gchar *) "taskList",          eccp_widget_glade },
 	{ E_CONFIG_PAGE,          (gchar *) "15.alarms",                    (gchar *) "alarms",            eccp_widget_glade },
 	{ E_CONFIG_PAGE,          (gchar *) "20.freeBusy",                  (gchar *) "freebusy",          eccp_widget_glade },
-	{ E_CONFIG_SECTION,       (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "defaultFBServer",   eccp_widget_glade },
+	{ E_CONFIG_SECTION,       (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "default-freebusy-vbox",   eccp_widget_glade },
 };
 
 static void
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index b94803fc43..6b6218df70 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -1234,9 +1234,10 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vbox16">
+      <object class="GtkVBox" id="alarms">
         <property name="visible">True</property>
         <property name="border_width">12</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="label67">
@@ -1319,9 +1320,10 @@
       <object class="GtkVBox" id="freebusy">
         <property name="visible">True</property>
         <property name="border_width">12</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
-          <object class="GtkLabel" id="label25">
+          <object class="GtkLabel" id="default-freebusy-header">
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Default Free/Busy Server</property>
@@ -1336,22 +1338,13 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox12">
+          <object class="GtkAlignment" id="default-freebusy-alignment">
             <property name="visible">True</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label27">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
+            <property name="left_padding">12</property>
             <child>
-              <object class="GtkVBox" id="vbox7">
+              <object class="GtkVBox" id="default-freebusy-vbox">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkHBox" id="hbox18">
@@ -1372,6 +1365,7 @@
                       <object class="GtkEntry" id="template_url">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -1398,13 +1392,11 @@
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -1426,8 +1418,8 @@
   </object>
   <object class="GtkSizeGroup" id="day_begins_ends_sizegroup">
     <widgets>
-      <widget name="day_start_label"/>
       <widget name="day_end_label"/>
+      <widget name="day_start_label"/>
     </widgets>
   </object>
 </interface>
diff --git a/e-util/e-util.c b/e-util/e-util.c
index c5360f94a1..68662bd3d4 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -285,6 +285,44 @@ e_lookup_action_group (GtkUIManager *ui_manager,
 }
 
 /**
+ * e_builder_get_widget:
+ * @builder: a #GtkBuilder
+ * @widget_name: name of a widget in @builder
+ *
+ * Gets the widget named @widget_name.  Note that this function does not
+ * increment the reference count of the returned widget.  If @widget_name
+ * could not be found in the @builder<!-- -->'s object tree, a run-time
+ * warning is emitted since this usually indicates a programming error.
+ *
+ * This is a convenience function to work around the awkwardness of
+ * #GtkBuilder returning #GObject pointers, when the vast majority of
+ * the time you want a #GtkWidget pointer.
+ *
+ * If you need something from @builder other than a #GtkWidget, or you
+ * want to test for the existence of some widget name without incurring
+ * a run-time warning, use gtk_builder_get_object().
+ *
+ * Returns: the widget named @widget_name, or %NULL
+ **/
+GtkWidget *
+e_builder_get_widget (GtkBuilder *builder,
+                      const gchar *widget_name)
+{
+	GObject *object;
+
+	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
+	g_return_val_if_fail (widget_name != NULL, NULL);
+
+	object = gtk_builder_get_object (builder, widget_name);
+	if (object == NULL) {
+		g_warning ("Could not find widget '%s'", widget_name);
+		return NULL;
+	}
+
+	return GTK_WIDGET (object);
+}
+
+/**
  * e_load_ui_builder_definition:
  * @builder: a #GtkBuilder
  * @basename: basename of the UI definition file
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 42749c1c25..71fc12f431 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -34,11 +34,6 @@
  * for backward-compatibility (not that we really care about that). */
 #include <libedataserver/e-data-server-util.h>
 
-/* Convenience macro to help migrate from libglade to GtkBuilder.
- * Use it as a direct replacement for glade_xml_get_widget(). */
-#define e_builder_get_widget(builder, name) \
-	GTK_WIDGET (gtk_builder_get_object ((builder), (name)))
-
 G_BEGIN_DECLS
 
 typedef enum {
@@ -60,6 +55,8 @@ GtkAction *	e_lookup_action			(GtkUIManager *ui_manager,
 						 const gchar *action_name);
 GtkActionGroup *e_lookup_action_group		(GtkUIManager *ui_manager,
 						 const gchar *group_name);
+GtkWidget *	e_builder_get_widget		(GtkBuilder *builder,
+						 const gchar *widget_name);
 void		e_load_ui_builder_definition	(GtkBuilder *builder,
 						 const gchar *basename);
 gint		e_action_compare_by_label	(GtkAction *action1,
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index aaff1b0ecf..f2776d6b56 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -175,10 +175,8 @@ struct _EMAccountEditorPrivate {
 	GtkButton *sent_folder_button;
 	GtkToggleButton *trash_folder_check;
 	GtkButton *trash_folder_button;
-	GtkWidget *trash_folder_fixed;
 	GtkToggleButton *junk_folder_check;
 	GtkButton *junk_folder_button;
-	GtkWidget *junk_folder_fixed;
 	GtkButton *restore_folders_button;
 
 	/* Security */
@@ -1346,9 +1344,10 @@ static struct _provider_host_info emae_transport_host_info[] = {
 	{ 0 },
 };
 
-/* This is used to map each of the two services in a typical account to the widgets that represent each service.
-   i.e. the receiving (source) service, and the sending (transport) service.
-   It is used throughout the following code to drive each page */
+/* This is used to map each of the two services in a typical account to
+ * the widgets that represent each service.  i.e. the receiving (source)
+ * service, and the sending (transport) service.  It is used throughout
+ * the following code to drive each page. */
 static struct _service_info {
 	gint account_uri_key;
 	gint save_passwd_key;
@@ -1380,23 +1379,69 @@ static struct _service_info {
 	const gchar *remember_password;
 
 	struct _provider_host_info *host_info;
+
 } emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = {
-	{ E_ACCOUNT_SOURCE_URL, E_ACCOUNT_SOURCE_SAVE_PASSWD,
-	  "source_frame", "source_type_dropdown",
-	  "source_vbox", "source_description", "source_host", "source_host_label", "source_user", "source_user_label", "source_path", "source_path_label", "source_path_entry",
-	  "source_security_frame", "source_ssl_hbox", "source_use_ssl", "source_ssl_disabled",
-	  NULL, "source_auth_frame",
-	  "source_auth_dropdown", "source_check_supported",
+
+	{ E_ACCOUNT_SOURCE_URL,
+	  E_ACCOUNT_SOURCE_SAVE_PASSWD,
+
+	  "source-config-section",
+	  "source_type_dropdown",
+
+	  "vboxSourceBorder",
+	  "source_description",
+	  "source_host",
+	  "source_host_label",
+	  "source_user",
+	  "source_user_label",
+	  "source_path",
+	  "source_path_label",
+	  "source_path_entry",
+
+	  "source-security-section",
+	  "source_ssl_hbox",
+	  "source_use_ssl",
+	  "source_ssl_disabled",
+
+	  NULL,
+	  "source-auth-section",
+
+	  "source_auth_dropdown",
+	  "source_check_supported",
+
 	  "source_remember_password",
-	  emae_source_host_info,
-	},
-	{ E_ACCOUNT_TRANSPORT_URL, E_ACCOUNT_TRANSPORT_SAVE_PASSWD,
-	  "transport_frame", "transport_type_dropdown",
-	  "transport_vbox", "transport_description", "transport_host", "transport_host_label", "transport_user", "transport_user_label", NULL, NULL, NULL,
-	  "transport_security_frame", "transport_ssl_hbox", "transport_use_ssl", "transport_ssl_disabled",
-	  "transport_needs_auth", "transport_auth_frame",
-	  "transport_auth_dropdown", "transport_check_supported",
+
+	  emae_source_host_info },
+
+	{ E_ACCOUNT_TRANSPORT_URL,
+	  E_ACCOUNT_TRANSPORT_SAVE_PASSWD,
+
+	  "transport-server-section",
+	  "transport_type_dropdown",
+
+	  "vboxTransportBorder",
+	  "transport_description",
+	  "transport_host",
+	  "transport_host_label",
+	  "transport_user",
+	  "transport_user_label",
+	  NULL,
+	  NULL,
+	  NULL,
+
+	  "transport-security-section",
+	  "transport_ssl_hbox",
+	  "transport_use_ssl",
+	  "transport_ssl_disabled",
+
+	  "transport_needs_auth",
+	  "transport-auth-section",
+
+	  "transport_auth_dropdown",
+	  "transport_check_supported",
+
 	  "transport_remember_password",
+
 	  emae_transport_host_info,
 	},
 };
@@ -2189,7 +2234,7 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	for (i=0;i<G_N_ELEMENTS (emae_identity_entries);i++)
 		priv->identity_entries[i] = emae_account_entry (emae, emae_identity_entries[i].name, emae_identity_entries[i].item, builder);
 
-	priv->management_frame = e_builder_get_widget (builder, "management_frame");
+	priv->management_frame = e_builder_get_widget (builder, "management-section");
 
 	priv->default_account = GTK_TOGGLE_BUTTON (e_builder_get_widget (builder, "management_default"));
 	if (!e_get_default_account ()
@@ -2222,9 +2267,14 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 		gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity")));
 	}
 
-	emae_queue_widgets (emae, builder, "account_vbox", "identity-required-table",
-			    "identity-optional-table", "identity_optional_frame",
-			    "identity_address", NULL);
+	emae_queue_widgets (
+		emae, builder,
+		"account_vbox",
+		"identity-required-table",
+		"identity-optional-table",
+		"identity-optional-section",
+		"identity_address",
+		NULL);
 
 	g_object_unref (builder);
 
@@ -2261,7 +2311,13 @@ emae_receive_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 		gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Receiving Email")));
 	}
 
-	emae_queue_widgets (emae, builder, "source-type-table", "table4", "vbox181", "vbox179", NULL);
+	emae_queue_widgets (
+		emae, builder,
+		"source-type-table",
+		"source-config-table",
+		"source-security-vbox",
+		"source-auth-vbox",
+		NULL);
 
 	g_object_unref (builder);
 
@@ -2743,7 +2799,13 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol
 		gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Sending Email")));
 	}
 
-	emae_queue_widgets (emae, builder, "transport-type-table", "vbox12", "vbox183", "vbox61", NULL);
+	emae_queue_widgets (
+		emae, builder,
+		"transport-type-table",
+		"transport-server-table",
+		"transport-security-table",
+		"transport-auth-table",
+		NULL);
 
 	g_object_unref (builder);
 
@@ -2852,7 +2914,10 @@ emae_real_url_folder_changed (EMFolderSelectionButton *folder, EMAccountEditor *
 }
 
 static void
-setup_checkable_folder (EMAccountEditor *emae, guint32 flag, GtkWidget *check, GtkWidget *button, GtkWidget *fixed)
+setup_checkable_folder (EMAccountEditor *emae,
+                        guint32 flag,
+                        GtkWidget *check,
+                        GtkWidget *button)
 {
 	EAccount *account;
 	gboolean available;
@@ -2868,7 +2933,7 @@ setup_checkable_folder (EMAccountEditor *emae, guint32 flag, GtkWidget *check, G
 	account = em_account_editor_get_modified_account (emae);
 	g_return_if_fail (account != NULL);
 
-	folderbutt = (EMFolderSelectionButton *)button;
+	folderbutt = EM_FOLDER_SELECTION_BUTTON (button);
 	url = emae_account_url (emae, emae_service_info[emae->priv->source.type].account_uri_key);
 
 	emae_get_checkable_folder_keys_widgets (emae, flag, NULL, NULL, &param_key);
@@ -2911,11 +2976,9 @@ setup_checkable_folder (EMAccountEditor *emae, guint32 flag, GtkWidget *check, G
 	if (available) {
 		gtk_widget_show (check);
 		gtk_widget_show (button);
-		gtk_widget_show (fixed);
 	} else {
 		gtk_widget_hide (check);
 		gtk_widget_hide (button);
-		gtk_widget_hide (fixed);
 	}
 
 	camel_url_free (url);
@@ -2946,13 +3009,17 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 
 	priv->trash_folder_check = GTK_TOGGLE_BUTTON (e_builder_get_widget (builder, "trash_folder_check"));
 	priv->trash_folder_button = GTK_BUTTON (e_builder_get_widget (builder, "trash_folder_butt"));
-	priv->trash_folder_fixed = e_builder_get_widget (builder, "trash_folder_fixed");
-	setup_checkable_folder (emae, CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER, GTK_WIDGET (priv->trash_folder_check), GTK_WIDGET (priv->trash_folder_button), priv->trash_folder_fixed);
+	setup_checkable_folder (
+		emae, CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER,
+		GTK_WIDGET (priv->trash_folder_check),
+		GTK_WIDGET (priv->trash_folder_button));
 
 	priv->junk_folder_check = GTK_TOGGLE_BUTTON (e_builder_get_widget (builder, "junk_folder_check"));
 	priv->junk_folder_button = GTK_BUTTON (e_builder_get_widget (builder, "junk_folder_butt"));
-	priv->junk_folder_fixed = e_builder_get_widget (builder, "junk_folder_fixed");
-	setup_checkable_folder (emae, CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER, GTK_WIDGET (priv->junk_folder_check), GTK_WIDGET (priv->junk_folder_button), priv->junk_folder_fixed);
+	setup_checkable_folder (
+		emae, CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER,
+		GTK_WIDGET (priv->junk_folder_check),
+		GTK_WIDGET (priv->junk_folder_button));
 
 	/* Special Folders "Reset Defaults" button */
 	priv->restore_folders_button = (GtkButton *)e_builder_get_widget (builder, "default_folders_button");
@@ -2987,7 +3054,12 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	}else {
 		gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Defaults")));
 	}
-	emae_queue_widgets (emae, builder, "vbox184", "table8", NULL);
+
+	emae_queue_widgets (
+		emae, builder,
+		"special-folders-table",
+		"composing-messages-table",
+		NULL);
 
 	g_object_unref (builder);
 
@@ -3149,8 +3221,8 @@ static EMConfigItem emae_editor_items[] = {
 	{ E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page },
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source-type-table", emae_widget_glade },
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "source-config-table", emae_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/20.security", (gchar *) "source-security-table", emae_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-table", emae_widget_glade },
+	{ E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "source-security-vbox", emae_widget_glade },
+	{ E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-vbox", emae_widget_glade },
 
 	/* Most sections for this is auto-generated from the camel config */
 	{ E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), },
@@ -3217,8 +3289,8 @@ static EMConfigItem emae_assistant_items[] = {
 	{ E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page },
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source-type-table", emae_widget_glade },
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "source-config-table", emae_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/20.security", (gchar *) "source-security-table", emae_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-table", emae_widget_glade },
+	{ E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "source-security-vbox", emae_widget_glade },
+	{ E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-vbox", emae_widget_glade },
 
 	/* Most sections for this is auto-generated fromt the camel config */
 	{ E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), },
@@ -3232,7 +3304,7 @@ static EMConfigItem emae_assistant_items[] = {
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "30.send/30.auth", (gchar *) "transport-auth-table", emae_widget_glade },
 
 	{ E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page },
-	{ E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade },
+	{ E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade },
 	{ E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade },
 
 	{ E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page },
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index a8712ccdbf..6112eccd83 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires evolution 0.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">1.5</property>
@@ -257,8 +258,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity_address_label"/>
                       <relation type="labelled-by" target="identity-required-header"/>
+                      <relation type="labelled-by" target="identity_address_label"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -303,8 +304,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity-required-header"/>
                       <relation type="labelled-by" target="identity_full_name_label"/>
+                      <relation type="labelled-by" target="identity-required-header"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -419,8 +420,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity_organization_label"/>
                       <relation type="labelled-by" target="identity-optional-header"/>
+                      <relation type="labelled-by" target="identity_organization_label"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -452,8 +453,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity-optional-header"/>
                       <relation type="labelled-by" target="reply_to_label"/>
+                      <relation type="labelled-by" target="identity-optional-header"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -1499,16 +1500,54 @@ For example: "Work" or "Personal"</property>
                   <placeholder/>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="EMFolderSelectionButton" id="drafts_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                  </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="EMFolderSelectionButton" id="sent_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="EMFolderSelectionButton" id="trash_folder_butt">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="EMFolderSelectionButton" id="junk_folder_butt">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
                 </child>
               </object>
             </child>
@@ -4954,15 +4993,15 @@ for display purposes only. </property>
   </object>
   <object class="GtkSizeGroup" id="composer-label-size-group">
     <widgets>
-      <widget name="lblCharset"/>
-      <widget name="lblReplyStyle"/>
       <widget name="lblForwardStyle"/>
+      <widget name="lblReplyStyle"/>
+      <widget name="lblCharset"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="composer-combo-box-size-group">
     <widgets>
-      <widget name="comboboxReplyStyle"/>
       <widget name="comboboxForwardStyle"/>
+      <widget name="comboboxReplyStyle"/>
     </widgets>
   </object>
 </interface>
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 366fa5d6e4..21db864103 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -320,12 +320,7 @@ static EMConfigItem emcp_items[] = {
 
 	{ E_CONFIG_SECTION,
 	  (gchar *) "00.general/00.behavior",
-	  (gchar *) "vboxBehavior",
-	  emcp_widget_glade },
-
-	{ E_CONFIG_SECTION,
-	  (gchar *) "00.general/10.alerts",
-	  (gchar *) "vboxAlerts",
+	  (gchar *) "default-behavior-vbox",
 	  emcp_widget_glade },
 
 	{ E_CONFIG_PAGE,
@@ -340,14 +335,14 @@ static EMConfigItem emcp_items[] = {
 	  (gchar *) "vboxSpellChecking",
 	  emcp_widget_glade },
 
-	{ E_CONFIG_SECTION,
+	{ E_CONFIG_SECTION_TABLE,
 	  (gchar *) "20.spellcheck/00.languages",
-	  (gchar *) "vbox178",
+	  (gchar *) "languages-table",
 	  emcp_widget_glade },
 
 	{ E_CONFIG_SECTION,
 	  (gchar *) "20.spellcheck/00.options",
-	  (gchar *) "vboxOptions",
+	  (gchar *) "spell-options-vbox",
 	  emcp_widget_glade },
 };
 
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index d5cde4f79f..21f233fd61 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -634,11 +634,10 @@ emmp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 static EMConfigItem emmp_items[] = {
 	{ E_CONFIG_BOOK, (gchar *) "", (gchar *) "preferences_toplevel", emmp_widget_glade },
 	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxMailGeneral", emmp_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.fonts", (gchar *) "message-fonts-table", emmp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "message-display-vbox", emmp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "delete-mail-vbox", emmp_widget_glade },
 	{ E_CONFIG_PAGE, (gchar *) "10.html", (gchar *) "vboxHtmlMail", emmp_widget_glade },
-	{ E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "mail-general-vbox", emmp_widget_glade },
+	{ E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "html-general-vbox", emmp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "loading-images-vbox", emmp_widget_glade },
 	{ E_CONFIG_PAGE, (gchar *) "20.labels", (gchar *) "frameColours", emmp_widget_glade },
 	/* this is a table, so we can't use it { E_CONFIG_SECTION, "20.labels/00.labels", "tableColours", emmp_widget_glade }, */
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 48285e5fad..fee1985dc4 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -267,7 +267,7 @@ ignore_hosts_entry_changed_cb (GtkWidget *widget, const gchar *key)
 static EMConfigItem emnp_items[] = {
 	{ E_CONFIG_BOOK, (gchar *) "", (gchar *) "network_preferences_toplevel", emnp_widget_glade },
 	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxNetworkGeneral", emnp_widget_glade },
-	{ E_CONFIG_SECTION, (gchar *) "00.general/00.proxy", (gchar *) "frameProxy", emnp_widget_glade },
+	{ E_CONFIG_SECTION, (gchar *) "00.general/00.proxy", (gchar *) "proxy-vbox", emnp_widget_glade },
 };
 
 static void
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index a46215b41f..554719810e 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -224,7 +224,7 @@ eppm_enable_toggled (GtkCellRendererToggle *renderer,
 
 static void
 action_plugin_manager_cb (GtkAction *action,
-                          EShellWindow *shell_window)
+                          EExtension *extension)
 {
 	Manager *m;
 	gint i;
@@ -239,13 +239,17 @@ action_plugin_manager_cb (GtkAction *action,
 	GSList *plugins, *link;
 	gchar *string;
 	GtkWidget *subvbox;
+	EExtensible *extensible;
 
 	m = g_malloc0 (sizeof (*m));
 
+	/* Retrieve the parent EShellWindow. */
+	extensible = e_extension_get_extensible (extension);
+
 	/* Setup the ui */
 	dialog = gtk_dialog_new_with_buttons (
 		_("Plugin Manager"),
-		GTK_WINDOW (shell_window),
+		GTK_WINDOW (extensible),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);