Bug 589153 - Use GtkBuilder instead of libglade

7 files changed, 597 insertions, 288 deletions

diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index e43494b879..33b9311d90 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -2,7 +2,7 @@ if OS_WIN32
 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la
 endif
 
-privsolib_LTLIBRARIES =	libemiscwidgets.la
+privsolib_LTLIBRARIES = libemiscwidgets.la
 
 widgetsincludedir = $(privincludedir)/misc
 
@@ -14,7 +14,7 @@ pilot_sources =
 pilot_headers =
 endif
 
-glade_DATA = e-send-options.glade
+ui_DATA = e-send-options.ui
 
 widgetsinclude_HEADERS =			\
 	$(pilot_headers)			\
@@ -85,7 +85,7 @@ libemiscwidgets_la_CPPFLAGS =						\
 	-I$(top_srcdir)/filter						\
 	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
+	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DG_LOG_DOMAIN=__FILE__						\
 	$(EVOLUTION_MAIL_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)
@@ -220,7 +220,7 @@ test_preferences_window_LDADD = 		\
 
 
 EXTRA_DIST =			\
-	$(glade_DATA)		\
+	$(ui_DATA)		\
 	e-pilot-settings.h	\
 	e-pilot-settings.c	\
 	ChangeLog.pre-1-4
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 2b0eb8acd5..268931a357 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -40,6 +40,7 @@
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
+#include <e-util/e-binding.h>
 #include "e-calendar.h"
 
 #define E_DATE_EDIT_GET_PRIVATE(obj) \
@@ -112,13 +113,20 @@ struct _EDateEditPrivate {
 
 	/* set to TRUE when the date has been changed by typing to the entry */
 	gboolean has_been_changed;
+
+	gboolean allow_no_date_set;
 };
 
 enum {
 	PROP_0,
+	PROP_ALLOW_NO_DATE_SET,
+	PROP_SHOW_DATE,
+	PROP_SHOW_TIME,
 	PROP_SHOW_WEEK_NUMBERS,
 	PROP_USE_24_HOUR_FORMAT,
-	PROP_WEEK_START_DAY
+	PROP_WEEK_START_DAY,
+	PROP_TWODIGIT_YEAR_CAN_FUTURE,
+	PROP_SET_NONE
 };
 
 enum {
@@ -207,6 +215,24 @@ date_edit_set_property (GObject *object,
                         GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_ALLOW_NO_DATE_SET:
+			e_date_edit_set_allow_no_date_set (
+				E_DATE_EDIT (object),
+				g_value_get_boolean (value));
+			return;
+
+		case PROP_SHOW_DATE:
+			e_date_edit_set_show_date (
+				E_DATE_EDIT (object),
+				g_value_get_boolean (value));
+			return;
+
+		case PROP_SHOW_TIME:
+			e_date_edit_set_show_time (
+				E_DATE_EDIT (object),
+				g_value_get_boolean (value));
+			return;
+
 		case PROP_SHOW_WEEK_NUMBERS:
 			e_date_edit_set_show_week_numbers (
 				E_DATE_EDIT (object),
@@ -224,6 +250,17 @@ date_edit_set_property (GObject *object,
 				E_DATE_EDIT (object),
 				g_value_get_int (value));
 			return;
+
+		case PROP_TWODIGIT_YEAR_CAN_FUTURE:
+			e_date_edit_set_twodigit_year_can_future (
+				E_DATE_EDIT (object),
+				g_value_get_boolean (value));
+			return;
+
+		case PROP_SET_NONE:
+			if (g_value_get_boolean (value))
+				e_date_edit_set_time (E_DATE_EDIT (object), -1);
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -236,6 +273,24 @@ date_edit_get_property (GObject *object,
                         GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_ALLOW_NO_DATE_SET:
+			g_value_set_boolean (
+				value, e_date_edit_get_allow_no_date_set (
+				E_DATE_EDIT (object)));
+			return;
+
+		case PROP_SHOW_DATE:
+			g_value_set_boolean (
+				value, e_date_edit_get_show_date (
+				E_DATE_EDIT (object)));
+			return;
+
+		case PROP_SHOW_TIME:
+			g_value_set_boolean (
+				value, e_date_edit_get_show_time (
+				E_DATE_EDIT (object)));
+			return;
+
 		case PROP_SHOW_WEEK_NUMBERS:
 			g_value_set_boolean (
 				value, e_date_edit_get_show_week_numbers (
@@ -253,6 +308,12 @@ date_edit_get_property (GObject *object,
 				value, e_date_edit_get_week_start_day (
 				E_DATE_EDIT (object)));
 			return;
+
+		case PROP_TWODIGIT_YEAR_CAN_FUTURE:
+			g_value_set_boolean (
+				value, e_date_edit_get_twodigit_year_can_future (
+				E_DATE_EDIT (object)));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -296,6 +357,36 @@ date_edit_class_init (EDateEditClass *class)
 
 	g_object_class_install_property (
 		object_class,
+		PROP_ALLOW_NO_DATE_SET,
+		g_param_spec_boolean (
+			"allow-no-date-set",
+			"Allow No Date Set",
+			NULL,
+			FALSE,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_SHOW_DATE,
+		g_param_spec_boolean (
+			"show-date",
+			"Show Date",
+			NULL,
+			TRUE,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_SHOW_TIME,
+		g_param_spec_boolean (
+			"show-time",
+			"Show Time",
+			NULL,
+			TRUE,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
 		PROP_SHOW_WEEK_NUMBERS,
 		g_param_spec_boolean (
 			"show-week-numbers",
@@ -326,6 +417,26 @@ date_edit_class_init (EDateEditClass *class)
 			0,
 			G_PARAM_READWRITE));
 
+	g_object_class_install_property (
+		object_class,
+		PROP_TWODIGIT_YEAR_CAN_FUTURE,
+		g_param_spec_boolean (
+			"twodigit-year-can-future",
+			"Two-digit year can be treated as future",
+			NULL,
+			TRUE,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_SET_NONE,
+		g_param_spec_boolean (
+			"set-none",
+			"Sets None as selected date",
+			NULL,
+			TRUE,
+			G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
 	signals[CHANGED] = g_signal_new (
 		"changed",
 		G_OBJECT_CLASS_TYPE (object_class),
@@ -587,6 +698,9 @@ create_children			(EDateEdit	*dedit)
 	gtk_container_add (GTK_CONTAINER (bbox), priv->none_button);
 	g_signal_connect (priv->none_button, "clicked",
 			  G_CALLBACK (on_date_popup_none_button_clicked), dedit);
+	e_binding_new (
+		dedit, "allow-no-date-set",
+		priv->none_button, "visible");
 }
 
 /* GtkWidget::mnemonic_activate() handler for the EDateEdit */
@@ -965,6 +1079,8 @@ e_date_edit_set_show_date		(EDateEdit	*dedit,
 		gtk_widget_show (priv->space);
 	else
 		gtk_widget_hide (priv->space);
+
+	g_object_notify (G_OBJECT (dedit), "show-date");
 }
 
 /**
@@ -1006,6 +1122,8 @@ e_date_edit_set_show_time		(EDateEdit	*dedit,
 	priv->show_time = show_time;
 
 	e_date_edit_update_time_combo_state (dedit);
+
+	g_object_notify (G_OBJECT (dedit), "show-time");
 }
 
 /**
@@ -1156,24 +1274,22 @@ e_date_edit_set_use_24_hour_format (EDateEdit *dedit,
 /* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
    return (time_t) -1 in this case. */
 gboolean
-e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit)
+e_date_edit_get_allow_no_date_set (EDateEdit *dedit)
 {
 	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
 
-	return GTK_WIDGET_VISIBLE (dedit->priv->none_button);
+	return dedit->priv->allow_no_date_set;
 }
 
 void
-e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
-					 gboolean	 allow_no_date_set)
+e_date_edit_set_allow_no_date_set (EDateEdit *dedit,
+                                   gboolean allow_no_date_set)
 {
 	g_return_if_fail (E_IS_DATE_EDIT (dedit));
 
-	if (allow_no_date_set) {
-		gtk_widget_show (dedit->priv->none_button);
-	} else {
-		gtk_widget_hide (dedit->priv->none_button);
+	dedit->priv->allow_no_date_set = allow_no_date_set;
 
+	if (!allow_no_date_set) {
 		/* If the date is showing, we make sure it isn't 'None' (we
 		   don't really mind if the time is empty), else if just the
 		   time is showing we make sure it isn't 'None'. */
@@ -1185,6 +1301,8 @@ e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
 				e_date_edit_set_time (dedit, 0);
 		}
 	}
+
+	g_object_notify (G_OBJECT (dedit), "allow-no-date-set");
 }
 
 /* The range of time to show in the time combo popup. */
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 32a3f2a899..5ef4e7cd3e 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -28,6 +28,7 @@
 
 #include "e-image-chooser.h"
 #include "e-util/e-util.h"
+#include "e-util/e-icon-factory.h"
 
 #define E_IMAGE_CHOOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -41,6 +42,14 @@ struct _EImageChooserPrivate {
 	gint image_buf_size;
 	gint image_width;
 	gint image_height;
+
+	/* Default Image */
+	gchar *icon_name;
+};
+
+enum {
+	PROP_0,
+	PROP_ICON_NAME
 };
 
 enum {
@@ -270,6 +279,66 @@ exit:
 }
 
 static void
+image_chooser_set_icon_name (EImageChooser *chooser,
+                             const gchar *icon_name)
+{
+	GtkIconTheme *icon_theme;
+	GtkIconInfo *icon_info;
+	const gchar *filename;
+	gint width, height;
+
+	g_return_if_fail (chooser->priv->icon_name == NULL);
+
+	chooser->priv->icon_name = g_strdup (icon_name);
+
+	icon_theme = gtk_icon_theme_get_default ();
+	gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, &height);
+
+	icon_info = gtk_icon_theme_lookup_icon (
+		icon_theme, icon_name, height, 0);
+	g_return_if_fail (icon_info != NULL);
+
+	filename = gtk_icon_info_get_filename (icon_info);
+	e_image_chooser_set_from_file (chooser, filename);
+	gtk_icon_info_free (icon_info);
+}
+
+static void
+image_chooser_set_property (GObject *object,
+                            guint property_id,
+                            const GValue *value,
+                            GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ICON_NAME:
+			image_chooser_set_icon_name (
+				E_IMAGE_CHOOSER (object),
+				g_value_get_string (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+image_chooser_get_property (GObject *object,
+                            guint property_id,
+                            GValue *value,
+                            GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ICON_NAME:
+			g_value_set_string (
+				value,
+				e_image_chooser_get_icon_name (
+				E_IMAGE_CHOOSER (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
 image_chooser_dispose (GObject *object)
 {
 	EImageChooserPrivate *priv;
@@ -298,6 +367,7 @@ image_chooser_finalize (GObject *object)
 	priv = E_IMAGE_CHOOSER_GET_PRIVATE (object);
 
 	g_free (priv->image_buf);
+	g_free (priv->icon_name);
 
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -312,9 +382,22 @@ e_image_chooser_class_init (EImageChooserClass *class)
 	g_type_class_add_private (class, sizeof (EImageChooserPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = image_chooser_set_property;
+	object_class->get_property = image_chooser_get_property;
 	object_class->dispose = image_chooser_dispose;
 	object_class->finalize = image_chooser_finalize;
 
+	g_object_class_install_property (
+		object_class,
+		PROP_ICON_NAME,
+		g_param_spec_string (
+			"icon-name",
+			"Icon Name",
+			NULL,
+			"stock_person",
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY));
+
 	signals[CHANGED] = g_signal_new (
 		"changed",
 		G_OBJECT_CLASS_TYPE (object_class),
@@ -397,10 +480,22 @@ e_image_chooser_get_type (void)
 	return type;
 }
 
+const gchar *
+e_image_chooser_get_icon_name (EImageChooser *chooser)
+{
+	g_return_val_if_fail (E_IS_IMAGE_CHOOSER (chooser), NULL);
+
+	return chooser->priv->icon_name;
+}
+
 GtkWidget *
-e_image_chooser_new (void)
+e_image_chooser_new (const gchar *icon_name)
 {
-	return g_object_new (E_TYPE_IMAGE_CHOOSER, NULL);
+	g_return_val_if_fail (icon_name != NULL, NULL);
+
+	return g_object_new (
+		E_TYPE_IMAGE_CHOOSER,
+		"icon-name", icon_name, NULL);
 }
 
 gboolean
diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index 7116500dc4..3338e16cd7 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -62,7 +62,8 @@ struct _EImageChooserClass {
 };
 
 GType		e_image_chooser_get_type	(void);
-GtkWidget *	e_image_chooser_new		(void);
+GtkWidget *	e_image_chooser_new		(const gchar *icon_name);
+const gchar *	e_image_chooser_get_icon_name	(EImageChooser *chooser);
 gboolean	e_image_chooser_set_from_file	(EImageChooser *chooser,
 						 const gchar *filename);
 gboolean	e_image_chooser_set_image_data	(EImageChooser *chooser,
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 10e60c6bfb..2a1b980eb5 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "e-util/e-error.h"
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index aa6c41e6d2..c134bfba6e 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -28,7 +28,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 #include <time.h>
 
 #include "e-util/e-util.h"
@@ -38,8 +37,7 @@
 #include "e-send-options.h"
 
 struct _ESendOptionsDialogPrivate {
-	/* Glade XML data */
-	GladeXML *xml;
+	GtkBuilder *builder;
 
 	gboolean gopts_needed;
 	gboolean global;
@@ -403,48 +401,46 @@ static gboolean
 get_widgets (ESendOptionsDialog *sod)
 {
 	ESendOptionsDialogPrivate *priv;
+	GtkBuilder *builder;
 
 	priv = sod->priv;
+	builder = sod->priv->builder;
 
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->main = GW ("send-options-dialog");
+	priv->main = e_builder_get_widget (builder, "send-options-dialog");
 	if (!priv->main)
 		return FALSE;
 
-	priv->priority = GW ("combo-priority");
-	priv->status = GW ("status-tracking");
-	priv->security = GW ("security-combo");
-	priv->notebook = (GtkNotebook *)GW ("notebook");
-	priv->reply_request = GW ("reply-request-button");
-	priv->reply_convenient = GW ("reply-convinient");
-	priv->reply_within = GW ("reply-within");
-	priv->within_days = GW ("within-days");
-	priv->delay_delivery = GW ("delay-delivery-button");
-	priv->delay_until = GW ("until-date");
+	priv->priority = e_builder_get_widget (builder, "combo-priority");
+	priv->status = e_builder_get_widget (builder, "status-tracking");
+	priv->security = e_builder_get_widget (builder, "security-combo");
+	priv->notebook = (GtkNotebook *)e_builder_get_widget (builder, "notebook");
+	priv->reply_request = e_builder_get_widget (builder, "reply-request-button");
+	priv->reply_convenient = e_builder_get_widget (builder, "reply-convinient");
+	priv->reply_within = e_builder_get_widget (builder, "reply-within");
+	priv->within_days = e_builder_get_widget (builder, "within-days");
+	priv->delay_delivery = e_builder_get_widget (builder, "delay-delivery-button");
+	priv->delay_until = e_builder_get_widget (builder, "until-date");
 	gtk_widget_show (priv->delay_until);
-	priv->expiration = GW ("expiration-button");
-	priv->expire_after = GW ("expire-after");
-	priv->create_sent = GW ("create-sent-button");
-	priv->delivered = GW ("delivered");
-	priv->delivered_opened = GW ("delivered-opened");
-	priv->all_info = GW ("all-info");
-	priv->autodelete = GW ("autodelete");
-	priv->when_opened = GW ("open-combo");
-	priv->when_declined = GW ("delete-combo");
-	priv->when_accepted = GW ("accept-combo");
-	priv->when_completed = GW ("complete-combo");
-	priv->security_label = GW ("security-label");
-	priv->gopts_label = GW ("gopts-label");
-	priv->sopts_label = GW ("slabel");
-	priv->priority_label = GW ("priority-label");
-	priv->until_label = GW ("until-label");
-	priv->opened_label = GW ("opened-label");
-	priv->declined_label = GW ("declined-label");
-	priv->accepted_label = GW ("accepted-label");
-	priv->completed_label = GW ("completed-label");
-
-#undef GW
+	priv->expiration = e_builder_get_widget (builder, "expiration-button");
+	priv->expire_after = e_builder_get_widget (builder, "expire-after");
+	priv->create_sent = e_builder_get_widget (builder, "create-sent-button");
+	priv->delivered = e_builder_get_widget (builder, "delivered");
+	priv->delivered_opened = e_builder_get_widget (builder, "delivered-opened");
+	priv->all_info = e_builder_get_widget (builder, "all-info");
+	priv->autodelete = e_builder_get_widget (builder, "autodelete");
+	priv->when_opened = e_builder_get_widget (builder, "open-combo");
+	priv->when_declined = e_builder_get_widget (builder, "delete-combo");
+	priv->when_accepted = e_builder_get_widget (builder, "accept-combo");
+	priv->when_completed = e_builder_get_widget (builder, "complete-combo");
+	priv->security_label = e_builder_get_widget (builder, "security-label");
+	priv->gopts_label = e_builder_get_widget (builder, "gopts-label");
+	priv->sopts_label = e_builder_get_widget (builder, "slabel");
+	priv->priority_label = e_builder_get_widget (builder, "priority-label");
+	priv->until_label = e_builder_get_widget (builder, "until-label");
+	priv->opened_label = e_builder_get_widget (builder, "opened-label");
+	priv->declined_label = e_builder_get_widget (builder, "declined-label");
+	priv->accepted_label = e_builder_get_widget (builder, "accepted-label");
+	priv->completed_label = e_builder_get_widget (builder, "completed-label");
 
 	return (priv->priority
 		&& priv->security
@@ -558,21 +554,6 @@ e_sendoptions_get_need_general_options (ESendOptionsDialog *sod)
 	return sod->priv->gopts_needed;
 }
 
-GtkWidget * send_options_make_dateedit (void);
-
-GtkWidget *
-send_options_make_dateedit (void)
-{
-	EDateEdit *dedit;
-
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-
-	e_date_edit_set_show_date (dedit, TRUE);
-	e_date_edit_set_show_time (dedit, TRUE);
-
-	return GTK_WIDGET (dedit);
-}
-
 gboolean
 e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set)
 {
@@ -597,7 +578,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data
 		case GTK_RESPONSE_CANCEL:
 			gtk_widget_hide (priv->main);
 			gtk_widget_destroy (priv->main);
-			g_object_unref (priv->xml);
+			g_object_unref (priv->builder);
 			break;
 		case GTK_RESPONSE_HELP:
 			e_display_help (
@@ -614,25 +595,20 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type
 {
 	ESendOptionsDialogPrivate *priv;
 	GtkWidget *toplevel;
-	gchar *filename;
 
 	g_return_val_if_fail (sod != NULL || E_IS_SENDOPTIONS_DIALOG (sod), FALSE);
 
 	priv = sod->priv;
 
-	filename = g_build_filename (EVOLUTION_GLADEDIR,
-				     "e-send-options.glade",
-				     NULL);
-	priv->xml = glade_xml_new (filename, NULL, NULL);
-	g_free (filename);
+	/* Make sure our custom widget classes are registered with
+	 * GType before we load the GtkBuilder definition file. */
+	E_TYPE_DATE_EDIT;
 
-	if (!priv->xml) {
-		g_message ( G_STRLOC ": Could not load the Glade XML file ");
-		return FALSE;
-	}
+	priv->builder = gtk_builder_new ();
+	e_load_ui_builder_definition (priv->builder, "e-send-options.ui");
 
 	if (!get_widgets(sod)) {
-		g_object_unref (priv->xml);
+		g_object_unref (priv->builder);
 		g_message (G_STRLOC ": Could not get the Widgets \n");
 		return FALSE;
 	}
@@ -745,7 +721,7 @@ e_sendoptions_dialog_init (GObject *object)
 	sod->data->gopts->security = 0;
 
 	priv->gopts_needed = TRUE;
-	priv->xml = NULL;
+	priv->builder = NULL;
 
 	priv->main = NULL;
 	priv->notebook = NULL;
diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.ui
index 58ee7f32c4..e43eb52eef 100644
--- a/widgets/misc/e-send-options.glade
+++ b/widgets/misc/e-send-options.ui
@@ -1,8 +1,120 @@
 <?xml version="1.0"?>
-<glade-interface>
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">5</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">2</property>
+  </object>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Undefined</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">High</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Standard</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Low</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Normal</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Proprietary</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Confidential</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Secret</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Top Secret</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">For Your Eyes Only</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mail Receipt</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mail Receipt</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model5">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mail Receipt</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model6">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mail Receipt</col>
+      </row>
+    </data>
+  </object>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkDialog" id="send-options-dialog">
+  <object class="GtkDialog" id="send-options-dialog">
     <property name="visible">True</property>
     <property name="can_default">True</property>
     <property name="title" translatable="yes">Send Options</property>
@@ -12,15 +124,15 @@
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox">
+      <object class="GtkVBox" id="vbox">
         <property name="visible">True</property>
         <property name="can_default">True</property>
         <child>
-          <widget class="GtkNotebook" id="notebook">
+          <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <widget class="GtkTable" id="general-options">
+              <object class="GtkTable" id="general-options">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="n_rows">4</property>
@@ -28,25 +140,25 @@
                 <property name="column_spacing">12</property>
                 <property name="row_spacing">12</property>
                 <child>
-                  <widget class="GtkLabel" id="label92">
+                  <object class="GtkLabel" id="label92">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="right_attach">4</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame16">
+                  <object class="GtkFrame" id="frame16">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkTable" id="table32">
+                      <object class="GtkTable" id="table32">
                         <property name="visible">True</property>
                         <property name="border_width">12</property>
                         <property name="n_rows">2</property>
@@ -54,80 +166,80 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">12</property>
                         <child>
-                          <widget class="GtkCheckButton" id="reply-request-button">
+                          <object class="GtkCheckButton" id="reply-request-button">
                             <property name="label" translatable="yes">R_eply requested</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment38">
+                          <object class="GtkAlignment" id="alignment38">
                             <property name="visible">True</property>
                             <property name="xscale">0</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkTable" id="table33">
+                              <object class="GtkTable" id="table33">
                                 <property name="visible">True</property>
                                 <property name="n_rows">2</property>
                                 <property name="n_columns">3</property>
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">12</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="reply-within">
+                                  <object class="GtkRadioButton" id="reply-within">
                                     <property name="label" translatable="yes">Wi_thin</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="within-days">
+                                  <object class="GtkSpinButton" id="within-days">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="adjustment">5 0 100 1 10 0</property>
+                                    <property name="adjustment">adjustment1</property>
                                     <property name="climb_rate">1</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label93">
+                                  <object class="GtkLabel" id="label93">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">days</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkRadioButton" id="reply-convinient">
+                                  <object class="GtkRadioButton" id="reply-convinient">
                                     <property name="label" translatable="yes">_When convenient</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -135,98 +247,95 @@
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">reply-within</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="right_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">3</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
+                            <property name="x_options"/>
+                            <property name="y_options"/>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label94">
+                    <child type="label">
+                      <object class="GtkLabel" id="label94">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Replies&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">4</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame17">
+                  <object class="GtkFrame" id="frame17">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkTable" id="table34">
+                      <object class="GtkTable" id="table34">
                         <property name="visible">True</property>
                         <property name="border_width">12</property>
                         <property name="n_rows">4</property>
                         <property name="n_columns">2</property>
                         <child>
-                          <widget class="GtkCheckButton" id="delay-delivery-button">
-                            <property name="label" translatable="yes" comments="To translators: This means Delay the message delivery for some time">_Delay message delivery</property>
+                          <object class="GtkCheckButton" id="delay-delivery-button">
+                            <property comments="To translators: This means Delay the message delivery for some time" name="label" translatable="yes">_Delay message delivery</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label95">
+                          <object class="GtkLabel" id="label95">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment39">
+                          <object class="GtkAlignment" id="alignment39">
                             <property name="visible">True</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox11">
+                              <object class="GtkHBox" id="hbox11">
                                 <property name="visible">True</property>
                                 <property name="border_width">12</property>
                                 <property name="spacing">12</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label96">
+                                  <object class="GtkLabel" id="label96">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_After:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">expire-after</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -234,12 +343,12 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="expire-after">
+                                  <object class="GtkSpinButton" id="expire-after">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="adjustment">2 0 100 1 10 0</property>
+                                    <property name="adjustment">adjustment2</property>
                                     <property name="climb_rate">1</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -247,20 +356,20 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label97">
+                                  <object class="GtkLabel" id="label97">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">days</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
                             <property name="top_attach">3</property>
@@ -269,53 +378,53 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="expiration-button">
+                          <object class="GtkCheckButton" id="expiration-button">
                             <property name="label" translatable="yes">_Set expiration date</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label98">
+                          <object class="GtkLabel" id="label98">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment40">
+                          <object class="GtkAlignment" id="alignment40">
                             <property name="visible">True</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox13">
+                              <object class="GtkHBox" id="hbox13">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="border_width">12</property>
                                 <property name="spacing">12</property>
                                 <child>
-                                  <widget class="GtkLabel" id="until-label">
+                                  <object class="GtkLabel" id="until-label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Until:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">until-date</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -323,55 +432,54 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="Custom" id="until-date">
+                                  <object class="EDateEdit" id="until-date">
                                     <property name="visible">True</property>
-                                    <property name="creation_function">send_options_make_dateedit</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label103">
+                    <child type="label">
+                      <object class="GtkLabel" id="label103">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Delivery Options&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">4</property>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="combo-priority">
+                  <object class="GtkComboBox" id="combo-priority">
                     <property name="visible">True</property>
-                    <property name="items" translatable="yes">Undefined
-High
-Standard
-Low</property>
-                  </widget>
+                    <property name="model">model1</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -381,42 +489,43 @@ Low</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="priority-label">
+                  <object class="GtkLabel" id="priority-label">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">_Priority:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">combo-priority</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="security-label">
+                  <object class="GtkLabel" id="security-label">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">_Classification:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">security-combo</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="security-combo">
+                  <object class="GtkComboBox" id="security-combo">
                     <property name="visible">True</property>
-                    <property name="items" translatable="yes">Normal
-Proprietary
-Confidential
-Secret
-Top Secret
-For Your Eyes Only</property>
-                  </widget>
+                    <property name="model">model2</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer2"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -430,47 +539,46 @@ For Your Eyes Only</property>
                 <child>
                   <placeholder/>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="gopts-label">
+            <child type="tab">
+              <object class="GtkLabel" id="gopts-label">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Gene_ral Options</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="status-tracking">
+              <object class="GtkVBox" id="status-tracking">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="spacing">12</property>
                 <child>
-                  <widget class="GtkFrame" id="frame18">
+                  <object class="GtkFrame" id="frame18">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment42">
+                      <object class="GtkAlignment" id="alignment42">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox10">
+                          <object class="GtkVBox" id="vbox10">
                             <property name="visible">True</property>
                             <property name="border_width">12</property>
                             <property name="spacing">12</property>
                             <child>
-                              <widget class="GtkCheckButton" id="create-sent-button">
+                              <object class="GtkCheckButton" id="create-sent-button">
                                 <property name="label" translatable="yes">Creat_e a sent item to track information</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -478,20 +586,20 @@ For Your Eyes Only</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkAlignment" id="alignment46">
+                              <object class="GtkAlignment" id="alignment46">
                                 <property name="visible">True</property>
                                 <property name="left_padding">19</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="delivered">
+                                  <object class="GtkRadioButton" id="delivered">
                                     <property name="label" translatable="yes">_Delivered</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -499,11 +607,11 @@ For Your Eyes Only</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkAlignment" id="alignment47">
+                              <object class="GtkAlignment" id="alignment47">
                                 <property name="visible">True</property>
                                 <property name="left_padding">19</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="delivered-opened">
+                                  <object class="GtkRadioButton" id="delivered-opened">
                                     <property name="label" translatable="yes">Deli_vered and opened</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -511,9 +619,9 @@ For Your Eyes Only</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">delivered</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -521,11 +629,11 @@ For Your Eyes Only</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkAlignment" id="alignment48">
+                              <object class="GtkAlignment" id="alignment48">
                                 <property name="visible">True</property>
                                 <property name="left_padding">19</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="all-info">
+                                  <object class="GtkRadioButton" id="all-info">
                                     <property name="label" translatable="yes">_All information</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -533,9 +641,9 @@ For Your Eyes Only</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">delivered</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -543,42 +651,39 @@ For Your Eyes Only</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkAlignment" id="alignment56">
+                              <object class="GtkAlignment" id="alignment56">
                                 <property name="visible">True</property>
                                 <property name="left_padding">19</property>
                                 <child>
-                                  <widget class="GtkCheckButton" id="autodelete">
+                                  <object class="GtkCheckButton" id="autodelete">
                                     <property name="label" translatable="yes">A_uto-delete sent item</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">4</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label106">
+                    <child type="label">
+                      <object class="GtkLabel" id="label106">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Status Tracking&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -586,16 +691,16 @@ For Your Eyes Only</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame19">
+                  <object class="GtkFrame" id="frame19">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment43">
+                      <object class="GtkAlignment" id="alignment43">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table35">
+                          <object class="GtkTable" id="table35">
                             <property name="visible">True</property>
                             <property name="border_width">12</property>
                             <property name="n_rows">4</property>
@@ -603,69 +708,74 @@ For Your Eyes Only</property>
                             <property name="column_spacing">12</property>
                             <property name="row_spacing">12</property>
                             <child>
-                              <widget class="GtkLabel" id="opened-label">
+                              <object class="GtkLabel" id="opened-label">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="label" translatable="yes">_When opened:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">open-combo</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="declined-label">
+                              <object class="GtkLabel" id="declined-label">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="label" translatable="yes">When decli_ned:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">delete-combo</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="completed-label">
+                              <object class="GtkLabel" id="completed-label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">When co_mpleted:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">complete-combo</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">3</property>
                                 <property name="bottom_attach">4</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="accepted-label">
+                              <object class="GtkLabel" id="accepted-label">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
                                 <property name="label" translatable="yes">When acce_pted:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">accept-combo</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBox" id="open-combo">
+                              <object class="GtkComboBox" id="open-combo">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes">None
-Mail Receipt</property>
-                              </widget>
+                                <property name="model">model3</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer3"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -673,11 +783,16 @@ Mail Receipt</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBox" id="delete-combo">
+                              <object class="GtkComboBox" id="delete-combo">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes">None
-Mail Receipt</property>
-                              </widget>
+                                <property name="model">model4</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer4"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -687,11 +802,16 @@ Mail Receipt</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBox" id="accept-combo">
+                              <object class="GtkComboBox" id="accept-combo">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes">None
-Mail Receipt</property>
-                              </widget>
+                                <property name="model">model5</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer5"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -701,11 +821,16 @@ Mail Receipt</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBox" id="complete-combo">
+                              <object class="GtkComboBox" id="complete-combo">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes">None
-Mail Receipt</property>
-                              </widget>
+                                <property name="model">model6</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer6"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -713,64 +838,56 @@ Mail Receipt</property>
                                 <property name="bottom_attach">4</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label111">
+                    <child type="label">
+                      <object class="GtkLabel" id="label111">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Return Notification&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="slabel">
+            <child type="tab">
+              <object class="GtkLabel" id="slabel">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Sta_tus Tracking</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="helpbutton1">
+              <object class="GtkButton" id="helpbutton1">
                 <property name="label">gtk-help</property>
-                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -778,15 +895,14 @@ Mail Receipt</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="cancelbutton1">
+              <object class="GtkButton" id="cancelbutton1">
                 <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -794,29 +910,33 @@ Mail Receipt</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton1">
+              <object class="GtkButton" id="okbutton1">
                 <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-11">helpbutton1</action-widget>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+</interface>