Merge branch 'master' into kill-bonobo

Conflicts:
	shell/e-shell-window-commands.c

2 files changed, 0 insertions, 37 deletions

diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index afe50a85b4..f1777ca55d 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <time.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-dateedit.h>
 
 #include "e-dialog-widgets.h"
 
@@ -499,39 +498,6 @@ e_dialog_combo_box_get (GtkWidget *widget, const int *value_map)
 }
 
 /**
- * e_dialog_dateedit_set:
- * @widget: A #GnomeDateEdit widget.
- * @t: Date/time value.
- *
- * Sets the value of a #GnomeDateEdit widget.
- **/
-void
-e_dialog_dateedit_set (GtkWidget *widget, time_t t)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GNOME_IS_DATE_EDIT (widget));
-
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t);
-}
-
-/**
- * e_dialog_dateedit_get:
- * @widget: A #GnomeDateEdit widget.
- *
- * Queries the value of a #GnomeDateEdit widget.
- *
- * Return value: Date/time value.
- **/
-time_t
-e_dialog_dateedit_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1);
-
-	return gnome_date_edit_get_time (GNOME_DATE_EDIT (widget));
-}
-
-/**
  * e_dialog_widget_hook_value:
  * @dialog: Dialog box in which the @widget lives in.
  * @widget: A widget that will control a variable.
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index 1a46c02fd3..f5ff123a4f 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -46,9 +46,6 @@ int e_dialog_spin_get_int (GtkWidget *widget);
 void e_dialog_combo_box_set (GtkWidget *widget, int value, const int *value_map);
 int e_dialog_combo_box_get (GtkWidget *widget, const int *value_map);
 
-void e_dialog_dateedit_set (GtkWidget *widget, time_t t);
-time_t e_dialog_dateedit_get (GtkWidget *widget);
-
 gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
 				     gpointer value_var, gpointer info);