1 files changed, 133 insertions, 160 deletions

diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
index 60638fff93..2046859174 100644
--- a/mail/mail-preferences.c
+++ b/mail/mail-preferences.c
@@ -25,24 +25,21 @@
 #include <config.h>
 #endif
 
-#include <string.h>
-
 #include "mail-preferences.h"
 
-#include <gconf/gconf.h>
+#include <gal/widgets/e-unicode.h>
+#include <gal/util/e-unicode-i18n.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include "widgets/misc/e-charset-picker.h"
 
 #include <bonobo/bonobo-generic-factory.h>
 
-#include "gal/util/e-iconv.h"
-
 #include "mail-config.h"
 
 
 static void mail_preferences_class_init (MailPreferencesClass *class);
 static void mail_preferences_init       (MailPreferences *dialog);
-static void mail_preferences_finalise   (GObject *obj);
+static void mail_preferences_finalise   (GtkObject *obj);
 
 static GtkVBoxClass *parent_class = NULL;
 
@@ -50,20 +47,20 @@ static GtkVBoxClass *parent_class = NULL;
 GtkType
 mail_preferences_get_type (void)
 {
-	static GType type = 0;
+	static GtkType type = 0;
 	
 	if (!type) {
-		GTypeInfo type_info = {
-			sizeof (MailPreferencesClass),
-			NULL, NULL,
-			(GClassInitFunc) mail_preferences_class_init,
-			NULL, NULL,
+		GtkTypeInfo type_info = {
+			"MailPreferences",
 			sizeof (MailPreferences),
-			0,
-			(GInstanceInitFunc) mail_preferences_init,
+			sizeof (MailPreferencesClass),
+			(GtkClassInitFunc) mail_preferences_class_init,
+			(GtkObjectInitFunc) mail_preferences_init,
+			(GtkArgSetFunc) NULL,
+			(GtkArgGetFunc) NULL
 		};
 		
-		type = g_type_register_static (gtk_vbox_get_type (), "MailPreferences", &type_info, 0);
+		type = gtk_type_unique (gtk_vbox_get_type (), &type_info);
 	}
 	
 	return type;
@@ -72,12 +69,14 @@ mail_preferences_get_type (void)
 static void
 mail_preferences_class_init (MailPreferencesClass *klass)
 {
-	GObjectClass *object_class;
+	GtkObjectClass *object_class;
 	
-	object_class = (GObjectClass *) klass;
-	parent_class = g_type_class_ref (gtk_vbox_get_type ());
+	object_class = (GtkObjectClass *) klass;
+	parent_class = gtk_type_class (gtk_vbox_get_type ());
 	
 	object_class->finalize = mail_preferences_finalise;
+	/* override methods */
+	
 }
 
 static void
@@ -87,27 +86,21 @@ mail_preferences_init (MailPreferences *preferences)
 }
 
 static void
-mail_preferences_finalise (GObject *obj)
+mail_preferences_finalise (GtkObject *obj)
 {
 	MailPreferences *prefs = (MailPreferences *) obj;
 	
-	g_object_unref (prefs->gui);
-	g_object_unref (prefs->pman);
-	g_object_unref (prefs->gconf);
+	gtk_object_unref (GTK_OBJECT (prefs->gui));
+	gtk_object_unref (GTK_OBJECT (prefs->pman));
+	gtk_object_unref (GTK_OBJECT (prefs->gconf));
 	
-        ((GObjectClass *)(parent_class))->finalize (obj);
+        ((GtkObjectClass *)(parent_class))->finalize (obj);
 }
 
 
 static void
-colorpicker_set_color (GnomeColorPicker *color, const char *str)
+colorpicker_set_color (GnomeColorPicker *color, guint32 rgb)
 {
-	GdkColor colour;
-	guint32 rgb;
-	
-	gdk_color_parse (str, &colour);
-	rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
-	
 	gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff);
 }
 
@@ -129,7 +122,16 @@ colorpicker_get_color (GnomeColorPicker *color)
 }
 
 static void
-settings_changed (GtkWidget *widget, gpointer user_data)
+toggle_button_toggled (GtkWidget *widget, gpointer user_data)
+{
+	MailPreferences *prefs = (MailPreferences *) user_data;
+	
+	if (prefs->control)
+		evolution_config_control_changed (prefs->control);
+}
+
+static void
+entry_changed (GtkWidget *widget, gpointer user_data)
 {
 	MailPreferences *prefs = (MailPreferences *) user_data;
 	
@@ -153,8 +155,8 @@ restore_labels_clicked (GtkWidget *widget, gpointer user_data)
 	int i;
 	
 	for (i = 0; i < 5; i++) {
-		gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name));
-		colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour);
+		e_utf8_gtk_entry_set_text (prefs->labels[i].name, U_(label_defaults[i].name));
+		colorpicker_set_color (prefs->labels[i].color, label_defaults[i].color);
 	}
 }
 
@@ -178,7 +180,8 @@ option_menu_connect (GtkOptionMenu *omenu, gpointer user_data)
 	items = GTK_MENU_SHELL (menu)->children;
 	while (items) {
 		item = items->data;
-		g_signal_connect (item, "activate", G_CALLBACK (menu_changed), user_data);
+		gtk_signal_connect (GTK_OBJECT (item), "activate",
+				    menu_changed, user_data);
 		items = items->next;
 	}
 }
@@ -188,18 +191,15 @@ mail_preferences_construct (MailPreferences *prefs)
 {
 	GtkWidget *widget, *toplevel, *menu;
 	const char *text;
-	GSList *list, *l;
 	GladeXML *gui;
-	gboolean bool;
-	int i, val;
-	char *buf;
+	int i;
 	char *names[][2] = {
 		{ "anim_check", "chkShowAnimatedImages" },
 		{ "magic_links_check", "chkAutoDetectLinks" },
 		{ NULL, NULL }
 	};
 	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_tab", NULL);
+	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_tab");
 	prefs->gui = gui;
 	
 	/* get our toplevel widget */
@@ -215,128 +215,122 @@ mail_preferences_construct (MailPreferences *prefs)
 	
 	/* Message Display */
 	prefs->timeout_toggle = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkMarkTimeout"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/display/mark_seen", NULL);
-	gtk_toggle_button_set_active (prefs->timeout_toggle, bool);
-	g_signal_connect (prefs->timeout_toggle, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->timeout_toggle, mail_config_get_do_seen_timeout ());
+	gtk_signal_connect (GTK_OBJECT (prefs->timeout_toggle), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->timeout = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinMarkTimeout"));
-	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", NULL);
-	gtk_spin_button_set_value (prefs->timeout, (1.0 * val) / 1000.0);
-	g_signal_connect (prefs->timeout, "changed", G_CALLBACK (settings_changed), prefs);
+	gtk_spin_button_set_value (prefs->timeout, (1.0 * mail_config_get_mark_as_seen_timeout ()) / 1000.0);
+	gtk_signal_connect (GTK_OBJECT (prefs->timeout), "changed",
+			    entry_changed, prefs);
 	
 	prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/format/charset", NULL);
-	menu = e_charset_picker_new (buf ? buf : e_iconv_locale_charset ());
+	menu = e_charset_picker_new (mail_config_get_default_charset ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (prefs->charset, prefs);
-	g_free (buf);
 	
 	prefs->citation_highlight = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkHighlightCitations"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/display/mark_citations", NULL);
-	gtk_toggle_button_set_active (prefs->citation_highlight, bool);
-	g_signal_connect (prefs->citation_highlight, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->citation_highlight, mail_config_get_citation_highlight ());
+	gtk_signal_connect (GTK_OBJECT (prefs->citation_highlight), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->citation_color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerHighlightCitations"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL);
-	colorpicker_set_color (prefs->citation_color, buf ? buf : "#737373");
-	g_signal_connect (prefs->citation_color, "color-set", G_CALLBACK (color_set), prefs);
-	g_free (buf);
+	colorpicker_set_color (prefs->citation_color, mail_config_get_citation_color ());
+	gtk_signal_connect (GTK_OBJECT (prefs->citation_color), "color-set",
+			    color_set, prefs);
 	
 	/* Deleting Mail */
 	prefs->empty_trash = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkEmptyTrashOnExit"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL);
-	gtk_toggle_button_set_active (prefs->empty_trash, bool);
-	g_signal_connect (prefs->empty_trash, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->empty_trash, mail_config_get_empty_trash_on_exit ());
+	gtk_signal_connect (GTK_OBJECT (prefs->empty_trash), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->confirm_expunge = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkConfirmExpunge"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/expunge", NULL);
-	gtk_toggle_button_set_active (prefs->confirm_expunge, bool);
-	g_signal_connect (prefs->confirm_expunge, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->confirm_expunge, mail_config_get_confirm_expunge ());
+	gtk_signal_connect (GTK_OBJECT (prefs->confirm_expunge), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	/* New Mail Notification */
-	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/notify/type", NULL);
 	prefs->notify_not = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyNot"));
-	gtk_toggle_button_set_active (prefs->notify_not, val == MAIL_CONFIG_NOTIFY_NOT);
-	g_signal_connect (prefs->notify_not, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->notify_not, mail_config_get_new_mail_notify () == MAIL_CONFIG_NOTIFY_NOT);
+	gtk_signal_connect (GTK_OBJECT (prefs->notify_not), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->notify_beep = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyBeep"));
-	gtk_toggle_button_set_active (prefs->notify_beep, val == MAIL_CONFIG_NOTIFY_BEEP);
-	g_signal_connect (prefs->notify_beep, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->notify_beep, mail_config_get_new_mail_notify () == MAIL_CONFIG_NOTIFY_BEEP);
+	gtk_signal_connect (GTK_OBJECT (prefs->notify_beep), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->notify_play_sound = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyPlaySound"));
-	gtk_toggle_button_set_active (prefs->notify_play_sound, val == MAIL_CONFIG_NOTIFY_PLAY_SOUND);
-	g_signal_connect (prefs->notify_play_sound, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->notify_play_sound,
+				      mail_config_get_new_mail_notify () == MAIL_CONFIG_NOTIFY_PLAY_SOUND);
+	gtk_signal_connect (GTK_OBJECT (prefs->notify_play_sound), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->notify_sound_file = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileNotifyPlaySound"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/notify/sound", NULL);
-	gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (prefs->notify_sound_file)), buf ? buf : "");
-	g_signal_connect (gnome_file_entry_gtk_entry (prefs->notify_sound_file), "changed",
-			  G_CALLBACK (settings_changed), prefs);
-	g_free (buf);
+	text = mail_config_get_new_mail_notify_sound_file ();
+	gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (prefs->notify_sound_file)),
+			    text ? text : "");
+	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (prefs->notify_sound_file)), "changed",
+			    entry_changed, prefs);
 	
 	/* HTML Mail tab */
 	
 	/* Loading Images */
-	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", NULL);
 	prefs->images_never = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesNever"));
-	gtk_toggle_button_set_active (prefs->images_never, val == MAIL_CONFIG_HTTP_NEVER);
-	g_signal_connect (prefs->images_never, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->images_never, mail_config_get_http_mode () == MAIL_CONFIG_HTTP_NEVER);
+	gtk_signal_connect (GTK_OBJECT (prefs->images_never), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->images_sometimes = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesSometimes"));
-	gtk_toggle_button_set_active (prefs->images_sometimes, val == MAIL_CONFIG_HTTP_SOMETIMES);
-	g_signal_connect (prefs->images_sometimes, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->images_sometimes, mail_config_get_http_mode () == MAIL_CONFIG_HTTP_SOMETIMES);
+	gtk_signal_connect (GTK_OBJECT (prefs->images_sometimes), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->images_always = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesAlways"));
-	gtk_toggle_button_set_active (prefs->images_always, val == MAIL_CONFIG_HTTP_ALWAYS);
-	g_signal_connect (prefs->images_always, "toggled", G_CALLBACK (settings_changed), prefs);
+	gtk_toggle_button_set_active (prefs->images_always, mail_config_get_http_mode () == MAIL_CONFIG_HTTP_ALWAYS);
+	gtk_signal_connect (GTK_OBJECT (prefs->images_always), "toggled",
+			    toggle_button_toggled, prefs);
 	
-#warning "gtkhtml prop manager"
-#if 0
 	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (prefs->gconf));
-	g_signal_connect (prefs->pman, "changed", G_CALLBACK (settings_changed), prefs);
-	g_object_ref (prefs->pman);
+	gtk_signal_connect (GTK_OBJECT (prefs->pman), "changed", toggle_button_toggled, prefs);
+	gtk_object_ref (GTK_OBJECT (prefs->pman));
 	
 	gtk_html_propmanager_set_names (prefs->pman, names);
 	gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
 	for (i = 0; names[i][0] != NULL; i++) {
 		widget = glade_xml_get_widget (gui, names[i][1]);
-		g_signal_connect (widget, "toggled", G_CALLBACK (settings_changed), prefs);
+		gtk_signal_connect (GTK_OBJECT (widget), "toggled",
+				    toggle_button_toggled, prefs);
 	}
-#endif
 	
 	prefs->prompt_unwanted_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptWantHTML"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL);
-	gtk_toggle_button_set_active (prefs->prompt_unwanted_html, bool);
-	g_signal_connect (prefs->prompt_unwanted_html, "toggled", G_CALLBACK (settings_changed), prefs);
-	
-	i = 0;
-	list = mail_config_get_labels ();
-	while (list != NULL && i < 5) {
-		MailConfigLabel *label;
+	gtk_toggle_button_set_active (prefs->prompt_unwanted_html, mail_config_get_confirm_unwanted_html ());
+	gtk_signal_connect (GTK_OBJECT (prefs->prompt_unwanted_html), "toggled",
+			    toggle_button_toggled, prefs);
+	
+	/* Labels and Colours tab */
+	for (i = 0; i < 5; i++) {
 		char *widget_name;
 		
-		label = list->data;
-		
 		widget_name = g_strdup_printf ("txtLabel%d", i);
 		prefs->labels[i].name = GTK_ENTRY (glade_xml_get_widget (gui, widget_name));
 		g_free (widget_name);
+		text = mail_config_get_label_name (i);
+		e_utf8_gtk_entry_set_text (prefs->labels[i].name, text ? text : "");
+		gtk_signal_connect (GTK_OBJECT (prefs->labels[i].name), "changed",
+				    entry_changed, prefs);
 		
 		widget_name = g_strdup_printf ("colorLabel%d", i);
 		prefs->labels[i].color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, widget_name));
 		g_free (widget_name);
-		
-		gtk_entry_set_text (prefs->labels[i].name, label->name);
-		g_signal_connect (prefs->labels[i].name, "changed", G_CALLBACK (settings_changed), prefs);
-		
-		colorpicker_set_color (prefs->labels[i].color, label->colour);
-		g_signal_connect (prefs->labels[i].color, "color_set", G_CALLBACK (color_set), prefs);
-		
-		i++;
-		list = list->next;
+		colorpicker_set_color (prefs->labels[i].color, mail_config_get_label_color (i));
+		gtk_signal_connect (GTK_OBJECT (prefs->labels[i].color), "color_set",
+				    color_set, prefs);
 	}
-	
 	prefs->restore_labels = GTK_BUTTON (glade_xml_get_widget (gui, "cmdRestoreLabels"));
-	g_signal_connect (prefs->restore_labels, "clicked", G_CALLBACK (restore_labels_clicked), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->restore_labels), "clicked",
+			    restore_labels_clicked, prefs);
 }
 
 
@@ -345,7 +339,7 @@ mail_preferences_new (void)
 {
 	MailPreferences *new;
 	
-	new = (MailPreferences *) g_object_new (mail_preferences_get_type (), NULL);
+	new = (MailPreferences *) gtk_type_new (mail_preferences_get_type ());
 	mail_preferences_construct (new);
 	
 	return (GtkWidget *) new;
@@ -356,91 +350,70 @@ void
 mail_preferences_apply (MailPreferences *prefs)
 {
 	GtkWidget *entry, *menu;
-	char *string, buf[20];
-	const char *cstring;
-	GSList *list, *l;
+	char *string;
 	guint32 rgb;
 	int i, val;
 	
 	/* General tab */
 	
 	/* Message Display */
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/mark_seen",
-			       gtk_toggle_button_get_active (prefs->timeout_toggle), NULL);
+	mail_config_set_do_seen_timeout (gtk_toggle_button_get_active (prefs->timeout_toggle));
 	
-	val = (int) (gtk_spin_button_get_value (prefs->timeout) * 1000.0);
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", val, NULL);
+	val = (int) (gtk_spin_button_get_value_as_float (prefs->timeout) * 1000);
+	mail_config_set_mark_as_seen_timeout (val);
 	
 	menu = gtk_option_menu_get_menu (prefs->charset);
-	if (!(string = e_charset_picker_get_charset (menu)))
-		string = g_strdup (e_iconv_locale_charset ());
-	
-	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/format/charset", string, NULL);
-	g_free (string);
+	string = e_charset_picker_get_charset (menu);
+	if (string) {
+		mail_config_set_default_charset (string);
+		g_free (string);
+	}
 	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/mark_citations",
-			       gtk_toggle_button_get_active (prefs->citation_highlight), NULL);
+	mail_config_set_citation_highlight (gtk_toggle_button_get_active (prefs->citation_highlight));
 	
 	rgb = colorpicker_get_color (prefs->citation_color);
-	g_snprintf (buf, sizeof (buf), "#%0.6x", rgb);
-	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", buf, NULL);
+	mail_config_set_citation_color (rgb);
 	
 	/* Deleting Mail */
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit",
-			       gtk_toggle_button_get_active (prefs->empty_trash), NULL);
+	mail_config_set_empty_trash_on_exit (gtk_toggle_button_get_active (prefs->empty_trash));
 	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/expunge",
-			       gtk_toggle_button_get_active (prefs->confirm_expunge), NULL);
+	mail_config_set_confirm_expunge (gtk_toggle_button_get_active (prefs->confirm_expunge));
 	
 	/* New Mail Notification */
 	if (gtk_toggle_button_get_active (prefs->notify_not))
-		val = MAIL_CONFIG_NOTIFY_NOT;
+		mail_config_set_new_mail_notify (MAIL_CONFIG_NOTIFY_NOT);
 	else if (gtk_toggle_button_get_active (prefs->notify_beep))
-		val = MAIL_CONFIG_NOTIFY_BEEP;
+		mail_config_set_new_mail_notify (MAIL_CONFIG_NOTIFY_BEEP);
 	else
-		val = MAIL_CONFIG_NOTIFY_PLAY_SOUND;
-	
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/notify/type", val, NULL);
+		mail_config_set_new_mail_notify (MAIL_CONFIG_NOTIFY_PLAY_SOUND);
 	
 	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prefs->notify_sound_file));
-	cstring = gtk_entry_get_text (GTK_ENTRY (entry));
-	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/notify/sound", cstring, NULL);
+	string = gtk_entry_get_text (GTK_ENTRY (entry));
+	mail_config_set_new_mail_notify_sound_file (string);
 	
 	/* HTML Mail */
 	if (gtk_toggle_button_get_active (prefs->images_always))
-		val = MAIL_CONFIG_HTTP_ALWAYS;
+		mail_config_set_http_mode (MAIL_CONFIG_HTTP_ALWAYS);
 	else if (gtk_toggle_button_get_active (prefs->images_sometimes))
-		val = MAIL_CONFIG_HTTP_SOMETIMES;
+		mail_config_set_http_mode (MAIL_CONFIG_HTTP_SOMETIMES);
 	else
-		val = MAIL_CONFIG_HTTP_NEVER;
-	
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", val, NULL);
+		mail_config_set_http_mode (MAIL_CONFIG_HTTP_NEVER);
 	
-#warning "gtkhtml propmanager"
-#if 0	
 	gtk_html_propmanager_apply (prefs->pman);
-#endif
 	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/unwanted_html",
-			       gtk_toggle_button_get_active (prefs->prompt_unwanted_html), NULL);
+	mail_config_set_confirm_unwanted_html (gtk_toggle_button_get_active (prefs->prompt_unwanted_html));
 	
 	/* Labels and Colours */
-	list = NULL;
-	for (i = 4; i >= 0; i--) {
-		cstring = gtk_entry_get_text (prefs->labels[i].name);
+	for (i = 0; i < 5; i++) {
+		/* save the label... */
+		string = e_utf8_gtk_entry_get_text (prefs->labels[i].name);
+		mail_config_set_label_name (i, string);
+		g_free (string);
+		
+		/* save the colour... */
 		rgb = colorpicker_get_color (prefs->labels[i].color);
-		string = g_strdup_printf ("%s:#%0.6x", cstring, rgb);
-		list = g_slist_prepend (list, string);
-	}
-	
-	gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/labels", GCONF_VALUE_STRING, list, NULL);
-	
-	l = list;
-	while (l != NULL) {
-		g_free (l->data);
-		l = l->next;
+		mail_config_set_label_color (i, rgb);
 	}
-	g_slist_free (list);
 	
-	gconf_client_suggest_sync (prefs->gconf, NULL);
+	mail_config_write ();
 }