Glade files for the configuration dialog.

2000-07-06  JP Rosevear  <jpr@arcavia.com>

	* mail-config.glade*: Glade files for the configuration dialog.

	* mail-config.c (providers_config_new): Build the dialog with
	glade.

svn path=/trunk/; revision=3933

5 files changed, 468 insertions, 247 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4dd83649ae..b9e71fb420 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-06  JP Rosevear  <jpr@arcavia.com>
+
+	* mail-config.glade*: Glade files for the configuration dialog.
+	
+	* mail-config.c (providers_config_new): Build the dialog with
+	glade.
+
 2000-07-06  Dan Winship  <danw@helixcode.com>
 
 	* folder-browser-factory.c, folder-browser.c, mail-ops.c,
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 94251e6359..3d16c59b69 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -103,10 +103,14 @@ gnorbadir = $(sysconfdir)/CORBA/servers
 gnorba_DATA = $(GOAD_FILES)
 endif
 
+gladedir   = $(datadir)/evolution/glade
+glade_DATA = 				\
+	mail-config.glade
+
 $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
 	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Mail.idl
 
-EXTRA_DIST = Mail.idl $(GOAD_FILES) $(OAF_FILES)
+EXTRA_DIST = Mail.idl $(glade_DATA) $(GOAD_FILES) $(OAF_FILES)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -118,4 +122,3 @@ evolution-mail.pure: evolution-mail
 	$(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
 
 endif
-
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 4adec9a78b..91142d95a7 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -29,6 +29,7 @@
 
 #include <gnome.h>
 #include <gtkhtml/gtkhtml.h>
+#include <glade/glade.h>
 
 #include "mail.h"
 #include "e-util/e-html-utils.h"
@@ -1682,38 +1683,24 @@ on_chkFormat_toggled (GtkWidget *widget, gpointer user_data)
 GtkWidget*
 providers_config_new (void)
 {
+	GladeXML *gui;
 	GtkWidget *providers_config;
 	GtkWidget *dialog_vbox1;
 	GtkWidget *notebook;
-	GtkWidget *hbox1;
-	GtkWidget *scrolledwindow1;
 	GtkWidget *clistIdentities;
-	GtkWidget *lblIdentities;
-	GtkWidget *vbuttonbox1;
 	GtkWidget *cmdIdentityAdd;
 	GtkWidget *cmdIdentityEdit;
 	GtkWidget *cmdIdentityDelete;
-	GtkWidget *lblIdentity;
-	GtkWidget *hbox2;
-	GtkWidget *scrolledwindow2;
 	GtkWidget *clistSources;
-	GtkWidget *lblMailSources;
-	GtkWidget *vbuttonbox2;
 	GtkWidget *cmdSourcesAdd;
 	GtkWidget *cmdSourcesEdit;
 	GtkWidget *cmdSourcesDelete;
-	GtkWidget *lblProviders;
-	GtkWidget *lblTransports;
-	GtkWidget *dialog_action_area1;
 	GtkWidget *cmdCamelServicesOK;
 	GtkWidget *cmdCamelServicesCancel;
 	GtkWidget *transport_page_vbox;
-	GtkWidget *format_vbox;
 	GtkWidget *chkFormat;
-	GtkWidget *lblOther;
 	GList *providers, *p, *sources, *transports;
 	GtkWidget *table, *interior_notebook;
-	char *titles[] = { _("Name"), _("Address"), _("Organization"), _("Signature file") };
 	char *path;
 	gboolean configured;
 	int page;
@@ -1738,53 +1725,30 @@ providers_config_new (void)
 						  prov);
 		}
 	}
-	
-	providers_config = gnome_dialog_new (_("Camel Providers Configuration"), NULL);
-	gtk_window_set_modal (GTK_WINDOW (providers_config), TRUE);
-	gtk_widget_set_name (providers_config, "providers_config");
-	gtk_object_set_data (GTK_OBJECT (providers_config), "providers_config", providers_config);
-	gtk_window_set_policy (GTK_WINDOW (providers_config), TRUE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (providers_config), 460, 340);
 
-	dialog_vbox1 = GNOME_DIALOG (providers_config)->vbox;
-	gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
-	gtk_object_set_data (GTK_OBJECT (providers_config), "dialog_vbox1", dialog_vbox1);
-	gtk_widget_show (dialog_vbox1);
+	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", NULL);
+	providers_config = glade_xml_get_widget (gui, "dialog");
 
-	notebook = gtk_notebook_new ();
-	gtk_widget_set_name (notebook, "notebook");
-	gtk_widget_ref (notebook);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "notebook", notebook,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (notebook);
-	gtk_box_pack_start (GTK_BOX (dialog_vbox1), notebook, TRUE, TRUE, 0);
+	gtk_widget_set_name (providers_config, "providers_config");
+	gtk_object_set_data (GTK_OBJECT (providers_config), 
+			     "providers_config", providers_config);
 
-	hbox1 = gtk_hbox_new (FALSE, 0);
-	gtk_widget_set_name (hbox1, "hbox1");
-	gtk_widget_ref (hbox1);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "hbox1", hbox1,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (hbox1);
-	gtk_container_add (GTK_CONTAINER (notebook), hbox1);
+	dialog_vbox1 = glade_xml_get_widget (gui, "dialog_vbox1");
+	gtk_object_set_data (GTK_OBJECT (providers_config), 
+			     "dialog_vbox1", dialog_vbox1);
 
-	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-	gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
-	gtk_widget_ref (scrolledwindow1);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "scrolledwindow1", scrolledwindow1,
+	notebook = glade_xml_get_widget (gui, "notebook");
+	gtk_widget_ref (notebook);
+	gtk_object_set_data_full (GTK_OBJECT (providers_config), 
+				  "notebook", notebook,
 				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (scrolledwindow1);
-	gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-	clistIdentities = gtk_clist_new_with_titles (4, titles);
-	gtk_widget_set_name (clistIdentities, "clistIdentities");
+	clistIdentities = glade_xml_get_widget (gui, "clistIdentities");
 	gtk_widget_ref (clistIdentities);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "clistIdentities", clistIdentities,
+	gtk_object_set_data_full (GTK_OBJECT (providers_config), 
+				  "clistIdentities", clistIdentities,
 				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (clistIdentities);
-	gtk_container_add (GTK_CONTAINER (scrolledwindow1), clistIdentities);
 	gtk_clist_set_column_width (GTK_CLIST (clistIdentities), 0, 80);
-	gtk_clist_column_titles_show (GTK_CLIST (clistIdentities));
 
 	/* Find out if stuff has been configured */
 	path = g_strdup_printf ("=%s/config=/mail/configured", evolution_dir);
@@ -1827,86 +1791,16 @@ providers_config_new (void)
 		gtk_clist_set_row_data (GTK_CLIST (clistIdentities), 0, data);
 	}
 
+	cmdIdentityAdd = glade_xml_get_widget (gui, "cmdIdentityAdd");
+	cmdIdentityEdit = glade_xml_get_widget (gui, "cmdIdentityEdit");
+	cmdIdentityDelete = glade_xml_get_widget (gui, "cmdIdentityDelete");
 
-	lblIdentities = gtk_label_new (_("Identities"));
-	gtk_widget_set_name (lblIdentities, "lblIdentities");
-	gtk_widget_ref (lblIdentities);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblIdentities", lblIdentities,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblIdentities);
-	gtk_clist_set_column_widget (GTK_CLIST (clistIdentities), 0, lblIdentities);
-
-	vbuttonbox1 = gtk_vbutton_box_new ();
-	gtk_widget_set_name (vbuttonbox1, "vbuttonbox1");
-	gtk_widget_ref (vbuttonbox1);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "vbuttonbox1", vbuttonbox1,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (vbuttonbox1);
-	gtk_box_pack_start (GTK_BOX (hbox1), vbuttonbox1, FALSE, FALSE, 0);
-
-	cmdIdentityAdd = gtk_button_new_with_label (_("Add"));
-	gtk_widget_set_name (cmdIdentityAdd, "cmdIdentityAdd");
-	gtk_widget_ref (cmdIdentityAdd);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdIdentityAdd", cmdIdentityAdd,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdIdentityAdd);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox1), cmdIdentityAdd);
-	GTK_WIDGET_SET_FLAGS (cmdIdentityAdd, GTK_CAN_DEFAULT);
-
-	cmdIdentityEdit = gtk_button_new_with_label (_("Edit"));
-	gtk_widget_set_name (cmdIdentityEdit, "cmdIdentityEdit");
-	gtk_widget_ref (cmdIdentityEdit);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdIdentityEdit", cmdIdentityEdit,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdIdentityEdit);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox1), cmdIdentityEdit);
-	GTK_WIDGET_SET_FLAGS (cmdIdentityEdit, GTK_CAN_DEFAULT);
-
-	cmdIdentityDelete = gtk_button_new_with_label (_("Delete"));
-	gtk_widget_set_name (cmdIdentityDelete, "cmdIdentityDelete");
-	gtk_widget_ref (cmdIdentityDelete);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdIdentityDelete", cmdIdentityDelete,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdIdentityDelete);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox1), cmdIdentityDelete);
-	GTK_WIDGET_SET_FLAGS (cmdIdentityDelete, GTK_CAN_DEFAULT);
-
-	lblIdentity = gtk_label_new (_("Identity"));
-	gtk_widget_set_name (lblIdentity, "lblIdentity");
-	gtk_widget_ref (lblIdentity);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblIdentity", lblIdentity,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblIdentity);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0),
-				    lblIdentity);
-
-	hbox2 = gtk_hbox_new (FALSE, 0);
-	gtk_widget_set_name (hbox2, "hbox2");
-	gtk_widget_ref (hbox2);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "hbox2", hbox2,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (hbox2);
-	gtk_container_add (GTK_CONTAINER (notebook), hbox2);
-
-	scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
-	gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
-	gtk_widget_ref (scrolledwindow2);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "scrolledwindow2", scrolledwindow2,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (scrolledwindow2);
-	gtk_box_pack_start (GTK_BOX (hbox2), scrolledwindow2, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-
-	clistSources = gtk_clist_new (1);
-	gtk_widget_set_name (clistSources, "clistSources");
+	clistSources = glade_xml_get_widget (gui, "clistSources");
 	gtk_widget_ref (clistSources);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "clistSources", clistSources,
+	gtk_object_set_data_full (GTK_OBJECT (providers_config), 
+				  "clistSources", clistSources,
 				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (clistSources);
-	gtk_container_add (GTK_CONTAINER (scrolledwindow2), clistSources);
 	gtk_clist_set_column_width (GTK_CLIST (clistSources), 0, 80);
-	gtk_clist_column_titles_show (GTK_CLIST (clistSources));
 
 	if (configured && !source) {
 		path = g_strdup_printf ("=%s/config=/mail/source", evolution_dir);
@@ -1924,70 +1818,17 @@ providers_config_new (void)
 		gtk_clist_set_row_data (GTK_CLIST (clistSources), 0, g_strdup(source));
 	}
 
-	lblMailSources = gtk_label_new (_("Mail sources"));
-	gtk_widget_set_name (lblMailSources, "lblMailSources");
-	gtk_widget_ref (lblMailSources);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblMailSources", lblMailSources,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblMailSources);
-	gtk_clist_set_column_widget (GTK_CLIST (clistSources), 0, lblMailSources);
-
-	vbuttonbox2 = gtk_vbutton_box_new ();
-	gtk_widget_set_name (vbuttonbox2, "vbuttonbox2");
-	gtk_widget_ref (vbuttonbox2);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "vbuttonbox2", vbuttonbox2,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (vbuttonbox2);
-	gtk_box_pack_start (GTK_BOX (hbox2), vbuttonbox2, FALSE, FALSE, 0);
-
-	cmdSourcesAdd = gtk_button_new_with_label (_("Add"));
-	gtk_widget_set_name (cmdSourcesAdd, "cmdSourcesAdd");
-	gtk_widget_ref (cmdSourcesAdd);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdSourcesAdd", cmdSourcesAdd,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdSourcesAdd);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox2), cmdSourcesAdd);
-	GTK_WIDGET_SET_FLAGS (cmdSourcesAdd, GTK_CAN_DEFAULT);
-
-	cmdSourcesEdit = gtk_button_new_with_label (_("Edit"));
-	gtk_widget_set_name (cmdSourcesEdit, "cmdSourcesEdit");
-	gtk_widget_ref (cmdSourcesEdit);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdSourcesEdit", cmdSourcesEdit,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdSourcesEdit);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox2), cmdSourcesEdit);
-	GTK_WIDGET_SET_FLAGS (cmdSourcesEdit, GTK_CAN_DEFAULT);
-
-	cmdSourcesDelete = gtk_button_new_with_label (_("Delete"));
-	gtk_widget_set_name (cmdSourcesDelete, "cmdSourcesDelete");
-	gtk_widget_ref (cmdSourcesDelete);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdSourcesDelete", cmdSourcesDelete,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdSourcesDelete);
-	gtk_container_add (GTK_CONTAINER (vbuttonbox2), cmdSourcesDelete);
-	GTK_WIDGET_SET_FLAGS (cmdSourcesDelete, GTK_CAN_DEFAULT);
-
-	lblProviders = gtk_label_new (_("Sources"));
-	gtk_widget_set_name (lblProviders, "lblProviders");
-	gtk_widget_ref (lblProviders);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblProviders", lblProviders,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblProviders);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1),
-				    lblProviders);
-
+	cmdSourcesAdd = glade_xml_get_widget (gui, "cmdSourcesAdd");
+	cmdSourcesEdit = glade_xml_get_widget (gui, "cmdSourcesEdit");
+	cmdSourcesDelete = glade_xml_get_widget (gui, "cmdSourcesDelete");
 
 	/* Setup the transport page */
-	transport_page_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (transport_page_vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (transport_page_vbox), 5);
-	gtk_widget_set_name (transport_page_vbox, "transport_page_vbox");
+	transport_page_vbox = glade_xml_get_widget (gui, "transport_page_vbox");
 	gtk_object_set_data (GTK_OBJECT (notebook), "transport_page_vbox", transport_page_vbox);
 	gtk_widget_ref (transport_page_vbox);
 	gtk_object_set_data_full (GTK_OBJECT (providers_config), "transport_page_vbox", transport_page_vbox,
 				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (transport_page_vbox);
-	gtk_container_add (GTK_CONTAINER (notebook), transport_page_vbox);
+
 	if (configured && !transport) {
 		path = g_strdup_printf ("=%s/config=/mail/transport", evolution_dir);
 		transport = gnome_config_get_string (path);
@@ -2006,44 +1847,12 @@ providers_config_new (void)
 	set_service_url (GTK_OBJECT (table), transport);
 	
 
-	lblTransports = gtk_label_new (_("Transports"));
-	gtk_widget_set_name (lblTransports, "lblTransports");
-	gtk_widget_ref (lblTransports);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblTransports", lblTransports,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblTransports);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2),
-				    lblTransports);
-
 	/* Lets make a page to mark Send HTML or text/plan...yay */
-	format_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (format_vbox), 8);
-	gtk_box_set_spacing (GTK_BOX (format_vbox), 5);
-	gtk_widget_set_name (format_vbox, "format_vbox");
-	gtk_object_set_data (GTK_OBJECT (notebook), "format_vbox", format_vbox);
-	gtk_widget_ref (format_vbox);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "format_vbox", format_vbox,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (format_vbox);
-	gtk_container_add (GTK_CONTAINER (notebook), format_vbox);
-
-	chkFormat = gtk_check_button_new_with_label (_("Send messages in HTML format"));
-	gtk_widget_set_name (chkFormat, "chkFormat");
+	chkFormat = glade_xml_get_widget (gui, "chkFormat");
 	gtk_object_set_data (GTK_OBJECT (notebook), "chkFormat", chkFormat);
 	gtk_widget_ref (chkFormat);
 	gtk_object_set_data_full (GTK_OBJECT (providers_config), "chkFormat", chkFormat,
 				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (chkFormat);
-	gtk_box_pack_start (GTK_BOX (format_vbox), chkFormat, FALSE, FALSE, 0);
-	
-	lblOther = gtk_label_new (_("Other"));
-	gtk_widget_set_name (lblOther, "lblOther");
-	gtk_widget_ref (lblOther);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "lblOther", lblOther,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (lblOther);
-	gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3),
-				    lblOther);
 
 	if (configured) {
 		char *buf;
@@ -2061,31 +1870,8 @@ providers_config_new (void)
 	}
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkFormat), format);
 
-
-	dialog_action_area1 = GNOME_DIALOG (providers_config)->action_area;
-	gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
-	gtk_object_set_data (GTK_OBJECT (providers_config), "dialog_action_area1", dialog_action_area1);
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8);
-
-	gnome_dialog_append_button (GNOME_DIALOG (providers_config), GNOME_STOCK_BUTTON_OK);
-	cmdCamelServicesOK = g_list_last (GNOME_DIALOG (providers_config)->buttons)->data;
-	gtk_widget_set_name (cmdCamelServicesOK, "cmdCamelServicesOK");
-	gtk_widget_ref (cmdCamelServicesOK);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdCamelServicesOK", cmdCamelServicesOK,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdCamelServicesOK);
-	GTK_WIDGET_SET_FLAGS (cmdCamelServicesOK, GTK_CAN_DEFAULT);
-
-	gnome_dialog_append_button (GNOME_DIALOG (providers_config), GNOME_STOCK_BUTTON_CANCEL);
-	cmdCamelServicesCancel = g_list_last (GNOME_DIALOG (providers_config)->buttons)->data;
-	gtk_widget_set_name (cmdCamelServicesCancel, "cmdCamelServicesCancel");
-	gtk_widget_ref (cmdCamelServicesCancel);
-	gtk_object_set_data_full (GTK_OBJECT (providers_config), "cmdCamelServicesCancel", cmdCamelServicesCancel,
-				  (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (cmdCamelServicesCancel);
-	GTK_WIDGET_SET_FLAGS (cmdCamelServicesCancel, GTK_CAN_DEFAULT);
+	cmdCamelServicesOK = glade_xml_get_widget (gui, "cmdCamelServicesOK");
+	cmdCamelServicesCancel = glade_xml_get_widget (gui, "cmdCamelServicesCancel");
 
 	gtk_signal_connect (GTK_OBJECT (cmdIdentityAdd), "clicked",
 			    GTK_SIGNAL_FUNC (on_cmdIdentityAdd_clicked),
@@ -2127,3 +1913,8 @@ providers_config_new (void)
 
 	return providers_config;
 }
+
+
+
+
+
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
new file mode 100644
index 0000000000..a11a7871fe
--- /dev/null
+++ b/mail/mail-config.glade
@@ -0,0 +1,397 @@
+<?xml version="1.0"?>
+<GTK-Interface>
+
+<project>
+  <name>config</name>
+  <program_name>config</program_name>
+  <directory></directory>
+  <source_directory>src</source_directory>
+  <pixmaps_directory>pixmaps</pixmaps_directory>
+  <language>C</language>
+  <gnome_support>True</gnome_support>
+  <gettext_support>True</gettext_support>
+  <output_main_file>False</output_main_file>
+  <output_support_files>False</output_support_files>
+  <output_build_files>False</output_build_files>
+  <output_translatable_strings>True</output_translatable_strings>
+  <translatable_strings_file>mail-config.glade.h</translatable_strings_file>
+</project>
+
+<widget>
+  <class>GnomeDialog</class>
+  <name>dialog</name>
+  <width>460</width>
+  <height>340</height>
+  <visible>False</visible>
+  <title>Camel Providers Configuration</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>True</modal>
+  <allow_shrink>True</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>False</auto_shrink>
+  <auto_close>False</auto_close>
+  <hide_on_close>False</hide_on_close>
+
+  <widget>
+    <class>GtkVBox</class>
+    <child_name>GnomeDialog:vbox</child_name>
+    <name>dialog_vbox1</name>
+    <homogeneous>False</homogeneous>
+    <spacing>8</spacing>
+    <child>
+      <padding>4</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
+
+    <widget>
+      <class>GtkHButtonBox</class>
+      <child_name>GnomeDialog:action_area</child_name>
+      <name>dialog-action_area1</name>
+      <layout_style>GTK_BUTTONBOX_END</layout_style>
+      <spacing>8</spacing>
+      <child_min_width>85</child_min_width>
+      <child_min_height>27</child_min_height>
+      <child_ipad_x>7</child_ipad_x>
+      <child_ipad_y>0</child_ipad_y>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>True</fill>
+	<pack>GTK_PACK_END</pack>
+      </child>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>cmdCamelServicesOK</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>cmdCamelServicesCancel</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkNotebook</class>
+      <name>notebook</name>
+      <can_focus>True</can_focus>
+      <show_tabs>True</show_tabs>
+      <show_border>True</show_border>
+      <tab_pos>GTK_POS_TOP</tab_pos>
+      <scrollable>False</scrollable>
+      <tab_hborder>2</tab_hborder>
+      <tab_vborder>2</tab_vborder>
+      <popup_enable>False</popup_enable>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
+
+      <widget>
+	<class>GtkHBox</class>
+	<name>hbox1</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+
+	<widget>
+	  <class>GtkScrolledWindow</class>
+	  <name>scrolledwindow1</name>
+	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkCList</class>
+	    <name>clistIdentities</name>
+	    <can_focus>True</can_focus>
+	    <columns>4</columns>
+	    <column_widths>80,80,80,80</column_widths>
+	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+	    <show_titles>True</show_titles>
+	    <shadow_type>GTK_SHADOW_IN</shadow_type>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CList:title</child_name>
+	      <name>lblIdentities</name>
+	      <label>Identities</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CList:title</child_name>
+	      <name>label6</name>
+	      <label>Address</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CList:title</child_name>
+	      <name>label7</name>
+	      <label>Organization</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CList:title</child_name>
+	      <name>label8</name>
+	      <label>Signature File</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonbox1</name>
+	  <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
+	  <spacing>10</spacing>
+	  <child_min_width>85</child_min_width>
+	  <child_min_height>27</child_min_height>
+	  <child_ipad_x>7</child_ipad_x>
+	  <child_ipad_y>0</child_ipad_y>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdIdentityAdd</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>Add</label>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdIdentityEdit</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>Edit</label>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdIdentityDelete</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>Delete</label>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>lblIdentities</name>
+	<label>Identity</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkHBox</class>
+	<name>hbox2</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+
+	<widget>
+	  <class>GtkScrolledWindow</class>
+	  <name>scrolledwindow2</name>
+	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkCList</class>
+	    <name>clistSources</name>
+	    <can_focus>True</can_focus>
+	    <columns>1</columns>
+	    <column_widths>80</column_widths>
+	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+	    <show_titles>True</show_titles>
+	    <shadow_type>GTK_SHADOW_IN</shadow_type>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CList:title</child_name>
+	      <name>label12</name>
+	      <label>Sources</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonbox2</name>
+	  <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
+	  <spacing>10</spacing>
+	  <child_min_width>85</child_min_width>
+	  <child_min_height>27</child_min_height>
+	  <child_ipad_x>7</child_ipad_x>
+	  <child_ipad_y>0</child_ipad_y>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdSourcesAdd</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>Add</label>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdSourcesEdit</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>Edit</label>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>cmdSourcesDelete</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>Delete</label>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label2</name>
+	<label>Sources</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>transport_page_vbox</name>
+	<border_width>8</border_width>
+	<homogeneous>False</homogeneous>
+	<spacing>5</spacing>
+
+	<widget>
+	  <class>Placeholder</class>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label3</name>
+	<label>Transports</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>format_vbox</name>
+	<border_width>8</border_width>
+	<homogeneous>False</homogeneous>
+	<spacing>5</spacing>
+
+	<widget>
+	  <class>GtkCheckButton</class>
+	  <name>chkFormat</name>
+	  <can_focus>True</can_focus>
+	  <label>Send messages in HTML format</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label4</name>
+	<label>Other</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+    </widget>
+  </widget>
+</widget>
+
+</GTK-Interface>
diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h
new file mode 100644
index 0000000000..2dfacc4d9a
--- /dev/null
+++ b/mail/mail-config.glade.h
@@ -0,0 +1,23 @@
+/*
+ * Translatable strings file generated by Glade.
+ * Add this file to your project's POTFILES.in.
+ * DO NOT compile it as part of your application.
+ */
+
+gchar *s = N_("Camel Providers Configuration");
+gchar *s = N_("Identities");
+gchar *s = N_("Address");
+gchar *s = N_("Organization");
+gchar *s = N_("Signature File");
+gchar *s = N_("Add");
+gchar *s = N_("Edit");
+gchar *s = N_("Delete");
+gchar *s = N_("Identity");
+gchar *s = N_("Sources");
+gchar *s = N_("Add");
+gchar *s = N_("Edit");
+gchar *s = N_("Delete");
+gchar *s = N_("Sources");
+gchar *s = N_("Transports");
+gchar *s = N_("Send messages in HTML format");
+gchar *s = N_("Other");