aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-09-15 01:38:47 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-09-15 01:49:08 +0800
commit95fe9256305bad92697bf1043efcbd61238cf94b (patch)
treeb1b8d204cba628580ab7097283c980c56507be14 /modules/mail
parentb6f61694d42b65d02d12c268e991fdf8b96f50bf (diff)
downloadgsoc2013-evolution-95fe9256305bad92697bf1043efcbd61238cf94b.tar.gz
gsoc2013-evolution-95fe9256305bad92697bf1043efcbd61238cf94b.tar.zst
gsoc2013-evolution-95fe9256305bad92697bf1043efcbd61238cf94b.zip
Fix a crapload of run-time warnings.
EConfig and EMAccountEditor are very, very brittle.
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/em-composer-prefs.c13
-rw-r--r--modules/mail/em-mailer-prefs.c3
-rw-r--r--modules/mail/em-network-prefs.c2
3 files changed, 6 insertions, 12 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