Fix a crapload of run-time warnings.

EConfig and EMAccountEditor are very, very brittle.

4 files changed, 12 insertions, 14 deletions

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);