1 files changed, 169 insertions, 167 deletions

diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index 647552af73..8e6cbb54f8 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -25,15 +25,16 @@
 #include <config.h>
 #endif
 
-#include <string.h>
-
 #include "mail-composer-prefs.h"
 #include "composer/e-msg-composer.h"
 
+#include <gtk/gtksignal.h>
+
 #include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-object-client.h>
 
 #include <gal/widgets/e-gui-utils.h>
-#include <gal/util/e-iconv.h>
+#include <gal/widgets/e-unicode.h>
 
 #include "widgets/misc/e-charset-picker.h"
 
@@ -47,30 +48,30 @@
 static void mail_composer_prefs_class_init (MailComposerPrefsClass *class);
 static void mail_composer_prefs_init       (MailComposerPrefs *dialog);
 static void mail_composer_prefs_destroy    (GtkObject *obj);
-static void mail_composer_prefs_finalise   (GObject *obj);
+static void mail_composer_prefs_finalise   (GtkObject *obj);
 
 static void sig_event_client (MailConfigSigEvent event, MailConfigSignature *sig, MailComposerPrefs *prefs);
 
 static GtkVBoxClass *parent_class = NULL;
 
 
-GType
+GtkType
 mail_composer_prefs_get_type (void)
 {
-	static GType type = 0;
+	static GtkType type = 0;
 	
 	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (MailComposerPrefsClass),
-			NULL, NULL,
-			(GClassInitFunc) mail_composer_prefs_class_init,
-			NULL, NULL,
+		GtkTypeInfo type_info = {
+			"MailComposerPrefs",
 			sizeof (MailComposerPrefs),
-			0,
-			(GInstanceInitFunc) mail_composer_prefs_init,
+			sizeof (MailComposerPrefsClass),
+			(GtkClassInitFunc) mail_composer_prefs_class_init,
+			(GtkObjectInitFunc) mail_composer_prefs_init,
+			(GtkArgSetFunc) NULL,
+			(GtkArgGetFunc) NULL
 		};
 		
-		type = g_type_register_static(gtk_vbox_get_type (), "MailComposerPrefs", &info, 0);
+		type = gtk_type_unique (gtk_vbox_get_type (), &type_info);
 	}
 	
 	return type;
@@ -79,13 +80,15 @@ mail_composer_prefs_get_type (void)
 static void
 mail_composer_prefs_class_init (MailComposerPrefsClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+	GtkObjectClass *object_class;
 	
-	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->destroy = mail_composer_prefs_destroy;
-	gobject_class->finalize = mail_composer_prefs_finalise;
+	object_class->finalize = mail_composer_prefs_finalise;
+	/* override methods */
+	
 }
 
 static void
@@ -97,27 +100,28 @@ mail_composer_prefs_init (MailComposerPrefs *composer_prefs)
 }
 
 static void
-mail_composer_prefs_finalise (GObject *obj)
+mail_composer_prefs_finalise (GtkObject *obj)
 {
 	MailComposerPrefs *prefs = (MailComposerPrefs *) obj;
 	
-	g_object_unref ((prefs->gui));
-	g_object_unref ((prefs->pman));
-	g_object_unref (prefs->enabled_pixbuf);
+	gtk_object_unref (GTK_OBJECT (prefs->gui));
+	gtk_object_unref (GTK_OBJECT (prefs->pman));
+	gdk_pixbuf_unref (prefs->enabled_pixbuf);
 	gdk_pixmap_unref (prefs->mark_pixmap);
-	g_object_unref (prefs->mark_bitmap);
-	
-        G_OBJECT_CLASS (parent_class)->finalize (obj);
+	gdk_bitmap_unref (prefs->mark_bitmap);
+
+        ((GtkObjectClass *)(parent_class))->finalize (obj);
 }
 
 static void
 mail_composer_prefs_destroy (GtkObject *obj)
 {
 	MailComposerPrefs *prefs = (MailComposerPrefs *) obj;
-
+	
 	mail_config_signature_unregister_client ((MailConfigSignatureClient) sig_event_client, prefs);
 	
-	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
+	if (GTK_OBJECT_CLASS (parent_class))
+		(* GTK_OBJECT_CLASS (parent_class)->destroy) (obj);
 }
 
 static void
@@ -125,7 +129,7 @@ attach_style_info (GtkWidget *item, gpointer user_data)
 {
 	int *style = user_data;
 	
-	g_object_set_data ((GObject *) item, "style", GINT_TO_POINTER (*style));
+	gtk_object_set_data (GTK_OBJECT (item), "style", GINT_TO_POINTER (*style));
 	
 	(*style)++;
 }
@@ -159,7 +163,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;
 	}
 }
@@ -173,7 +178,7 @@ sig_load_preview (MailComposerPrefs *prefs, MailConfigSignature *sig)
 		gtk_html_load_from_string (GTK_HTML (prefs->sig_preview), " ", 1);
 		return;
 	}
-	
+
 	if (sig->script)
 		str = mail_config_signature_run_script (sig->script);
 	else
@@ -214,7 +219,7 @@ sig_edit (GtkWidget *widget, MailComposerPrefs *prefs)
 	if (sig->filename && *sig->filename)
 		mail_signature_editor (sig);
 	else
-		e_notice (GTK_WINDOW (prefs), GTK_MESSAGE_ERROR,
+		e_notice (GTK_WINDOW (prefs), GNOME_MESSAGE_BOX_ERROR,
 			  _("Please specify signature filename\nin Advanced section of signature settings."));
 }
 
@@ -228,10 +233,16 @@ mail_composer_prefs_new_signature (MailComposerPrefs *prefs, gboolean html, cons
 	sig = mail_config_signature_add (html, script);
 	
 	if (prefs) {
-		if (sig->name)
-			name[0] = g_strconcat (sig->name, " ", _("[script]"), NULL);
-		else
-			name[0] = g_strdup (_("[script]"));
+		if (!(name[0] = e_utf8_to_gtk_string (GTK_WIDGET (prefs->sig_clist), sig->name)))
+			name[0] = g_strdup ("");
+		
+		if (sig->script) {
+			char *tmp;
+			
+			tmp = name[0];
+			name[0] = g_strconcat (tmp, _(" [script]"), NULL);
+			g_free (tmp);
+		}
 		
 		row = gtk_clist_append (prefs->sig_clist, name);
 		gtk_clist_set_row_data (prefs->sig_clist, row, sig);
@@ -270,43 +281,39 @@ sig_add (GtkWidget *widget, MailComposerPrefs *prefs)
 }
 
 static void
-sig_add_script_response (GtkWidget *widget, int button, MailComposerPrefs *prefs)
+sig_add_script_add (GtkWidget *widget, MailComposerPrefs *prefs)
 {
-	const char *script, *name;
-	GtkWidget *dialog;
+	char *script, *name;
 	GtkWidget *entry;
 	
-	if (button == GTK_RESPONSE_ACCEPT) {
-		entry = glade_xml_get_widget (prefs->sig_script_gui, "fileentry_add_script_script");
-		script = gtk_entry_get_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (entry))));
+	entry = glade_xml_get_widget (prefs->sig_script_gui, "fileentry_add_script_script");
+	script = gtk_entry_get_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (entry))));
+	
+	entry = glade_xml_get_widget (prefs->sig_script_gui, "entry_add_script_name");
+	name = e_utf8_gtk_entry_get_text (GTK_ENTRY (entry));
+	if (script && *script) {
+		struct stat st;
 		
-		entry = glade_xml_get_widget (prefs->sig_script_gui, "entry_add_script_name");
-		name = gtk_entry_get_text (GTK_ENTRY (entry));
-		if (script && *script) {
-			struct stat st;
+		if (!stat (script, &st)
+		    && S_ISREG (st.st_mode) && (st.st_mode & (S_IXOTH | S_IXGRP | S_IXUSR))) {
+			MailConfigSignature *sig;
+			
+			sig = mail_composer_prefs_new_signature (prefs, TRUE, script);
+			mail_config_signature_set_name (sig, name);
+			g_free (name);
+			gtk_widget_hide (prefs->sig_script_dialog);
 			
-			if (!stat (script, &st) && S_ISREG (st.st_mode) && (st.st_mode & (S_IXOTH | S_IXGRP | S_IXUSR))) {
-				MailConfigSignature *sig;
-				
-				sig = mail_composer_prefs_new_signature (prefs, TRUE, script);
-				mail_config_signature_set_name (sig, name);
-				gtk_widget_hide (prefs->sig_script_dialog);
-				
-				return;
-			}
+			return;
 		}
-		
-		dialog = gtk_message_dialog_new (GTK_WINDOW (prefs->sig_script_dialog),
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_CLOSE,
-						 "%s", _("You must specify a valid script name."));
-		
-		gtk_dialog_run ((GtkDialog *) dialog);
-		gtk_widget_destroy (dialog);
 	}
-	
-	gtk_widget_hide (widget);
+	gnome_dialog_run_and_close (GNOME_DIALOG (gnome_ok_dialog_parented (_("Please specify a valid script name"),
+									    GTK_WINDOW (prefs->sig_script_dialog))));
+}
+
+static void
+sig_add_script_cancel (GtkWidget *widget, MailComposerPrefs *prefs)
+{
+	gnome_dialog_close (GNOME_DIALOG (prefs->sig_script_dialog));
 }
 
 static void
@@ -347,21 +354,23 @@ sig_row_unselect (GtkCList *clist, int row, int col, GdkEvent *event, MailCompos
 static void
 sig_fill_clist (GtkCList *clist)
 {
-	char *name[1];
 	GList *l;
+	char *name[1];
 	int row;
 	
 	gtk_clist_freeze (clist);
 	for (l = mail_config_get_signature_list (); l; l = l->next) {
-		name[0] = ((MailConfigSignature *) l->data)->name;
-		if (((MailConfigSignature *) l->data)->script)
-			name[0] = g_strconcat (name[0], " ", _("[script]"), NULL);
-		else
-			name[0] = g_strdup (name[0]);
-		
+		name[0] = e_utf8_to_gtk_string (GTK_WIDGET (clist), ((MailConfigSignature *) l->data)->name);
+		if (((MailConfigSignature *) l->data)->script) {
+			char *tmp;
+			
+			tmp = name [0];
+			name[0] = g_strconcat (name[0], _(" [script]"), NULL);
+			g_free (tmp);
+		}
 		row = gtk_clist_append (clist, name);
 		gtk_clist_set_row_data (clist, row, l->data);
-		g_free (name[0]);
+		g_free (name [0]);
 	}
 	gtk_clist_thaw (clist);
 }
@@ -370,8 +379,6 @@ static void
 url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle)
 {
 	GtkHTMLStreamStatus status;
-	char buf[128];
-	ssize_t size;
 	int fd;
 	
 	if (!strncmp (url, "file:", 5))
@@ -380,12 +387,14 @@ url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle)
 	fd = open (url, O_RDONLY);
 	status = GTK_HTML_STREAM_OK;
 	if (fd != -1) {
-		while ((size = read (fd, buf, sizeof (buf)))) {
+		ssize_t size;
+		void *buf = alloca (1 << 7);
+		while ((size = read (fd, buf, 1 << 7))) {
 			if (size == -1) {
 				status = GTK_HTML_STREAM_ERROR;
 				break;
 			} else
-				gtk_html_write (html, handle, buf, size);
+				gtk_html_write (html, handle, (const gchar *) buf, size);
 		}
 	} else
 		status = GTK_HTML_STREAM_ERROR;
@@ -396,18 +405,24 @@ url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle)
 static void
 sig_event_client (MailConfigSigEvent event, MailConfigSignature *sig, MailComposerPrefs *prefs)
 {
-	char *text;
+	char *tmp, *tmp1;
 	
 	switch (event) {
 	case MAIL_CONFIG_SIG_EVENT_NAME_CHANGED:
 		d(printf ("accounts NAME CHANGED\n"));
-		if (sig->script)
-			text = g_strconcat (sig->name, " ", _("[script]"), NULL);
-		else
-			text = g_strdup (sig->name);
-		
-		gtk_clist_set_text (GTK_CLIST (prefs->sig_clist), sig->id, 0, text);
-		g_free (text);
+		tmp = e_utf8_to_gtk_string (GTK_WIDGET (prefs->sig_clist), sig->name);
+		if (sig->script) {
+			tmp1 = tmp;
+			tmp = g_strconcat (tmp, _(" [script]"), NULL);
+			g_free (tmp1);
+		}
+		gtk_clist_set_text (GTK_CLIST (prefs->sig_clist), sig->id, 0, tmp);
+		g_free (tmp);
+		if (sig == sig_current_sig (prefs)) {
+			prefs->sig_switch = TRUE;
+			/*e_utf8_gtk_entry_set_text (GTK_ENTRY (prefs->sig_name), sig->name);*/
+			prefs->sig_switch = FALSE;
+		}
 		break;
 	case MAIL_CONFIG_SIG_EVENT_CONTENT_CHANGED:
 		d(printf ("accounts CONTENT CHANGED\n"));
@@ -650,9 +665,9 @@ spell_language_enable (GtkWidget *widget, MailComposerPrefs *prefs)
 	GList *sel = GTK_CLIST (prefs->language)->selection;
 	
 	if (sel) {
-		int row = GPOINTER_TO_INT (sel->data);
 		GdkPixmap *pmap = NULL;
 		GdkBitmap *bmap;
+		int row = GPOINTER_TO_INT (sel->data);
 		
 		gtk_clist_get_pixmap (GTK_CLIST (prefs->language), row, 0, &pmap, &bmap);
 		if (pmap) {
@@ -678,7 +693,7 @@ spell_language_button_press (GtkWidget *widget, GdkEventButton *event, MailCompo
 			GdkPixmap *pmap = NULL;
 			GdkBitmap *bmap;
 			
-			g_signal_stop_emission_by_name (widget, "button_press_event");
+			gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "button_press_event");
 			
 			gtk_clist_get_pixmap (GTK_CLIST (prefs->language), row, 0, &pmap, &bmap);
 			if (pmap)
@@ -707,9 +722,9 @@ spell_setup (MailComposerPrefs *prefs)
 			char *texts[2];
 			
 			texts[0] = NULL;
-			texts[1] = _(prefs->language_seq->_buffer[i].name);
+			texts[1] = _(prefs->language_seq->_buffer [i].name);
 			gtk_clist_append (GTK_CLIST (prefs->language), texts);
-			gtk_clist_set_row_data (GTK_CLIST (prefs->language), i, prefs->language_seq->_buffer[i].abrev);
+			gtk_clist_set_row_data (GTK_CLIST (prefs->language), i, prefs->language_seq->_buffer [i].abrev);
 		}
 	}
 	gtk_clist_thaw (GTK_CLIST (prefs->language));
@@ -717,37 +732,40 @@ spell_setup (MailComposerPrefs *prefs)
 	spell_load_values (prefs);
 	spell_set_ui (prefs);
 	
-	glade_xml_signal_connect_data (prefs->gui, "spellColorSet", G_CALLBACK (spell_color_set), prefs);
+	glade_xml_signal_connect_data (prefs->gui, "spellColorSet", GTK_SIGNAL_FUNC (spell_color_set), prefs);
 	glade_xml_signal_connect_data (prefs->gui, "spellLanguageSelectRow",
-				       G_CALLBACK (spell_language_select_row), prefs);
+				       GTK_SIGNAL_FUNC (spell_language_select_row), prefs);
 	glade_xml_signal_connect_data (prefs->gui, "spellLanguageUnselectRow",
-				       G_CALLBACK (spell_language_unselect_row), prefs);
-	glade_xml_signal_connect_data (prefs->gui, "spellLanguageEnable", G_CALLBACK (spell_language_enable), prefs);
+				       GTK_SIGNAL_FUNC (spell_language_unselect_row), prefs);
+	glade_xml_signal_connect_data (prefs->gui, "spellLanguageEnable", GTK_SIGNAL_FUNC (spell_language_enable), prefs);
 	
-	g_signal_connect (prefs->language, "button_press_event", G_CALLBACK (spell_language_button_press), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->language), "button_press_event", spell_language_button_press, prefs);
 }
 
 static gboolean
 spell_setup_check_options (MailComposerPrefs *prefs)
 {
+	BonoboObjectClient *dictionary_client;
 	GNOME_Spell_Dictionary dict;
 	CORBA_Environment ev;
 	char *dictionary_id;
-
+	
 	dictionary_id = "OAFIID:GNOME_Spell_Dictionary:" SPELL_API_VERSION;
-	dict = bonobo_activation_activate_from_id(dictionary_id, 0, NULL, NULL);
-	if (dict == CORBA_OBJECT_NIL) {
+	dictionary_client = bonobo_object_activate (dictionary_id, 0);
+	
+	if (!dictionary_client) {
 		g_warning ("Cannot activate %s", dictionary_id);
 		
 		return FALSE;
 	}
+	dict = bonobo_object_corba_objref (BONOBO_OBJECT (dictionary_client));
 	
 	CORBA_exception_init (&ev);
 	prefs->language_seq = GNOME_Spell_Dictionary_getLanguages (dict, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION)
 		prefs->language_seq = NULL;
 	CORBA_exception_free (&ev);
-	
+
 	if (prefs->language_seq == NULL)
 		return FALSE;
 
@@ -766,11 +784,8 @@ static void
 mail_composer_prefs_construct (MailComposerPrefs *prefs)
 {
 	GtkWidget *toplevel, *widget, *menu, *info_pixmap;
-	GtkDialog *dialog;
 	GladeXML *gui;
-	gboolean bool;
 	int style;
-	char *buf;
 	char *names[][2] = {
 		{ "live_spell_check", "chkEnableSpellChecking" },
 		{ "magic_smileys_check", "chkAutoSmileys" },
@@ -780,9 +795,9 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	
 	prefs->gconf = gconf_client_get_default ();
 	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "composer_tab", NULL);
+	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "composer_tab");
 	prefs->gui = gui;
-	prefs->sig_script_gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "vbox_add_script_signature", NULL);
+	prefs->sig_script_gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "vbox_add_script_signature");
 	
 	/* get our toplevel widget */
 	toplevel = glade_xml_get_widget (gui, "toplevel");
@@ -797,42 +812,37 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	
 	/* Default Behavior */
 	prefs->send_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkSendHTML"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	gtk_toggle_button_set_active (prefs->send_html, bool);
-	g_signal_connect (prefs->send_html, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
+	gtk_toggle_button_set_active (prefs->send_html, mail_config_get_send_html ());
+	gtk_signal_connect (GTK_OBJECT (prefs->send_html), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->auto_smileys = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkAutoSmileys"));
-	/* FIXME: set active? */
-	g_signal_connect (prefs->auto_smileys, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->auto_smileys), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->prompt_empty_subject = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptEmptySubject"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/empty_subject", NULL);
-	gtk_toggle_button_set_active (prefs->prompt_empty_subject, bool);
-	g_signal_connect (prefs->prompt_empty_subject, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
+	gtk_toggle_button_set_active (prefs->prompt_empty_subject, mail_config_get_prompt_empty_subject ());
+	gtk_signal_connect (GTK_OBJECT (prefs->prompt_empty_subject), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->prompt_bcc_only = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptBccOnly"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/only_bcc", NULL);
-	gtk_toggle_button_set_active (prefs->prompt_bcc_only, bool);
-	g_signal_connect (prefs->prompt_bcc_only, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
+	gtk_toggle_button_set_active (prefs->prompt_bcc_only, mail_config_get_prompt_only_bcc ());
+	gtk_signal_connect (GTK_OBJECT (prefs->prompt_bcc_only), "toggled",
+			    toggle_button_toggled, prefs);
 	
 	prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/composer/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);
 	
-#warning "gtkhtml prop manager"
-#if 0	
 	/* Spell Checking: GtkHTML part */
 	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (NULL));
-	g_signal_connect (prefs->pman, "changed", G_CALLBACK(toggle_button_toggled), 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);
-#endif
-
+	
 	/* Spell Checking: GNOME Spell part */
 	prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor"));
 	prefs->language = GTK_CLIST (glade_xml_get_widget (gui, "clistSpellCheckLanguage"));
@@ -840,7 +850,7 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	info_pixmap = glade_xml_get_widget (gui, "pixmapSpellInfo");
 	gtk_clist_set_column_justification (prefs->language, 0, GTK_JUSTIFY_RIGHT);
 	gtk_clist_set_column_auto_resize (prefs->language, 0, TRUE);
-	gtk_image_set_from_file(GTK_IMAGE (info_pixmap), EVOLUTION_IMAGES "/info-bulb.png");
+	gnome_pixmap_load_file (GNOME_PIXMAP (info_pixmap), EVOLUTION_IMAGES "/info-bulb.png");
 	
 	if (!spell_setup_check_options (prefs)) {
 		gtk_widget_hide (GTK_WIDGET (prefs->colour));
@@ -849,46 +859,48 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	
 	/* Forwards and Replies */
 	prefs->forward_style = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuForwardStyle"));
-	style = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/format/forward_style", NULL);
-	gtk_option_menu_set_history (prefs->forward_style, style);
+	gtk_option_menu_set_history (prefs->forward_style, mail_config_get_default_forward_style ());
 	style = 0;
 	gtk_container_foreach (GTK_CONTAINER (gtk_option_menu_get_menu (prefs->forward_style)),
 			       attach_style_info, &style);
 	option_menu_connect (prefs->forward_style, prefs);
 	
 	prefs->reply_style = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuReplyStyle"));
-	style = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/format/reply_style", NULL);
-	gtk_option_menu_set_history (prefs->reply_style, style);
+	gtk_option_menu_set_history (prefs->reply_style, mail_config_get_default_reply_style ());
 	style = 0;
 	gtk_container_foreach (GTK_CONTAINER (gtk_option_menu_get_menu (prefs->reply_style)),
 			       attach_style_info, &style);
 	option_menu_connect (prefs->reply_style, prefs);
 	
 	/* Signatures */
-	dialog = (GtkDialog *) gtk_dialog_new ();
-	prefs->sig_script_dialog = (GtkWidget *) dialog;
-	gtk_dialog_add_buttons (dialog, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
-	gtk_window_set_title ((GtkWindow *) dialog, _("Add script signature"));
-	g_signal_connect (dialog, "response", G_CALLBACK (sig_add_script_response), prefs);
-	widget = glade_xml_get_widget (prefs->sig_script_gui, "vbox_add_script_signature");
-	gtk_box_pack_start_defaults ((GtkBox *) dialog->vbox, widget);
-	
 	prefs->sig_add = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureAdd"));
-	g_signal_connect (prefs->sig_add, "clicked", G_CALLBACK (sig_add), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->sig_add), "clicked",
+			    GTK_SIGNAL_FUNC (sig_add), prefs);
+	
+	prefs->sig_script_dialog = gnome_dialog_new (_("Add script signature"),
+						     _("Add Signature"), GNOME_STOCK_BUTTON_CANCEL, NULL);
+	gnome_dialog_close_hides (GNOME_DIALOG (prefs->sig_script_dialog), TRUE);
+	gtk_box_pack_start_defaults (GTK_BOX (GNOME_DIALOG (prefs->sig_script_dialog)->vbox),
+				     glade_xml_get_widget (prefs->sig_script_gui, "vbox_add_script_signature"));
+	gnome_dialog_button_connect (GNOME_DIALOG (prefs->sig_script_dialog), 0, sig_add_script_add, prefs);
+	gnome_dialog_button_connect (GNOME_DIALOG (prefs->sig_script_dialog), 1, sig_add_script_cancel, prefs);
 	
-	glade_xml_signal_connect_data (gui, "cmdSignatureAddScriptClicked", G_CALLBACK(sig_add_script), prefs);
+	glade_xml_signal_connect_data (gui, "cmdSignatureAddScriptClicked", sig_add_script, prefs);
 	
 	prefs->sig_edit = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureEdit"));
-	g_signal_connect (prefs->sig_edit, "clicked", G_CALLBACK (sig_edit), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->sig_edit), "clicked",
+			    GTK_SIGNAL_FUNC (sig_edit), prefs);
 	
 	prefs->sig_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureDelete"));
-	g_signal_connect (prefs->sig_delete, "clicked", G_CALLBACK (sig_delete), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->sig_delete), "clicked",
+			    GTK_SIGNAL_FUNC (sig_delete), prefs);
 	
 	prefs->sig_clist = GTK_CLIST (glade_xml_get_widget (gui, "clistSignatures"));
 	sig_fill_clist (prefs->sig_clist);
-	g_signal_connect (prefs->sig_clist, "select_row", G_CALLBACK (sig_row_select), prefs);
-	g_signal_connect (prefs->sig_clist, "unselect_row", G_CALLBACK (sig_row_unselect), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->sig_clist), "select_row",
+			    GTK_SIGNAL_FUNC (sig_row_select), prefs);
+	gtk_signal_connect (GTK_OBJECT (prefs->sig_clist), "unselect_row",
+			    GTK_SIGNAL_FUNC (sig_row_unselect), prefs);
 	if (mail_config_get_signature_list () == NULL) {
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->sig_delete, FALSE);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->sig_edit, FALSE);
@@ -897,7 +909,7 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	/* preview GtkHTML widget */
 	widget = glade_xml_get_widget (gui, "scrolled-sig");
 	prefs->sig_preview = (GtkHTML *) gtk_html_new ();
-	g_signal_connect (prefs->sig_preview, "url_requested", G_CALLBACK (url_requested), NULL);
+	gtk_signal_connect (GTK_OBJECT (prefs->sig_preview), "url_requested", GTK_SIGNAL_FUNC (url_requested), NULL);
 	gtk_widget_show (GTK_WIDGET (prefs->sig_preview));
 	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (prefs->sig_preview));
 	
@@ -913,7 +925,7 @@ mail_composer_prefs_new (void)
 {
 	MailComposerPrefs *new;
 	
-	new = (MailComposerPrefs *) g_object_new (mail_composer_prefs_get_type (), NULL);
+	new = (MailComposerPrefs *) gtk_type_new (mail_composer_prefs_get_type ());
 	mail_composer_prefs_construct (new);
 	
 	return (GtkWidget *) new;
@@ -930,45 +942,35 @@ mail_composer_prefs_apply (MailComposerPrefs *prefs)
 	/* General tab */
 	
 	/* Default Behavior */
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/composer/send_html",
-			       gtk_toggle_button_get_active (prefs->send_html), NULL);
-	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/empty_subject",
-			       gtk_toggle_button_get_active (prefs->prompt_empty_subject), NULL);
-	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/only_bcc",
-			       gtk_toggle_button_get_active (prefs->prompt_bcc_only), NULL);
+	mail_config_set_send_html (gtk_toggle_button_get_active (prefs->send_html));
+	mail_config_set_prompt_empty_subject (gtk_toggle_button_get_active (prefs->prompt_empty_subject));
+	mail_config_set_prompt_only_bcc (gtk_toggle_button_get_active (prefs->prompt_bcc_only));
 	
 	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/composer/charset", string, NULL);
-	g_free (string);
+	string = e_charset_picker_get_charset (menu);
+	if (string) {
+		mail_config_set_default_charset (string);
+		g_free (string);
+	}
 	
 	/* Spell Checking */
-#warning "gtkhtml propmanager"
-#if 0
 	gtk_html_propmanager_apply (prefs->pman);
-#endif
 	spell_apply (prefs);
 	
 	/* Forwards and Replies */
 	menu = gtk_option_menu_get_menu (prefs->forward_style);
 	item = gtk_menu_get_active (GTK_MENU (menu));
-	val = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "style"));
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/format/forward_style", val, NULL);
+	val = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item), "style"));
+	mail_config_set_default_forward_style (val);
 	
 	menu = gtk_option_menu_get_menu (prefs->reply_style);
 	item = gtk_menu_get_active (GTK_MENU (menu));
-	val = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "style"));
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/format/reply_style", val, NULL);
+	val = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item), "style"));
+	mail_config_set_default_reply_style (val);
 	
 	/* Keyboard Shortcuts */
 	/* FIXME: implement me */
 	
 	/* Signatures */
 	/* FIXME: implement me */
-	
-	gconf_client_suggest_sync (prefs->gconf, NULL);
 }