[evolution/gtk-builder] Deal with custom widgets in e-send-options.ui.

[Matthew Barnes <mbarnes src gnome org>]

commit 9679c937a9a4fd1296e046a777ebda9d1c44c98b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Nov 1 21:52:37 2009 -0600

    Deal with custom widgets in e-send-options.ui.

 widgets/misc/e-send-options.c  |   19 ++++---------------
 widgets/misc/e-send-options.ui |    3 +--
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 21125c6..c134bfb 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -554,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)
 {
@@ -615,6 +600,10 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type
 
 	priv = sod->priv;
 
+	/* Make sure our custom widget classes are registered with
+	 * GType before we load the GtkBuilder definition file. */
+	E_TYPE_DATE_EDIT;
+
 	priv->builder = gtk_builder_new ();
 	e_load_ui_builder_definition (priv->builder, "e-send-options.ui");
 
diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui
index 4501981..e43eb52 100644
--- a/widgets/misc/e-send-options.ui
+++ b/widgets/misc/e-send-options.ui
@@ -432,9 +432,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object 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>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>