gui/e-alarm-list.c gui/e-cal-component-memo-preview.c

2005-11-24  Tor Lillqvist  <tml@novell.com>

	* gui/e-alarm-list.c
	* gui/e-cal-component-memo-preview.c
	* gui/e-cal-component-preview.c
	* gui/e-cal-model.c
	* gui/e-cell-date-edit-text.c
	* gui/e-date-time-list.c
	* gui/e-itip-control.c
	* gui/e-memos.c
	* gui/e-tasks.c
	* gui/itip-utils.c
	* gui/print.c
	* gui/alarm-notify/alarm-notify-dialog.c
	* gui/alarm-notify/util.c
	* gui/dialogs/alarm-dialog.c
	* gui/dialogs/alarm-list-dialog.c
	* gui/dialogs/comp-editor-util.c
	* gui/dialogs/recurrence-page.c: Include e-time-utils.h from
	libedataserver instead of using evolution's copy which is going
	away.

svn path=/trunk/; revision=30659

18 files changed, 39 insertions, 17 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8d6a674924..c6860f72cf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,25 @@
+2005-11-24  Tor Lillqvist  <tml@novell.com>
+
+	* gui/e-alarm-list.c
+	* gui/e-cal-component-memo-preview.c
+	* gui/e-cal-component-preview.c
+	* gui/e-cal-model.c
+	* gui/e-cell-date-edit-text.c
+	* gui/e-date-time-list.c
+	* gui/e-itip-control.c
+	* gui/e-memos.c
+	* gui/e-tasks.c
+	* gui/itip-utils.c
+	* gui/print.c
+	* gui/alarm-notify/alarm-notify-dialog.c
+	* gui/alarm-notify/util.c
+	* gui/dialogs/alarm-dialog.c
+	* gui/dialogs/alarm-list-dialog.c
+	* gui/dialogs/comp-editor-util.c
+	* gui/dialogs/recurrence-page.c: Include e-time-utils.h from
+	libedataserver instead of using evolution's copy which is going
+	away.
+
 2005-11-23  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* gui/e-calendar-view.c (tooltip_grab), (get_label),
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index c9fd68029e..0e545721d6 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -38,7 +38,7 @@
 #  include <libgnomeui/gnome-winhints.h>
 #endif
 #include <glade/glade.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "alarm-notify-dialog.h"
 #include "config-data.h"
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 3749e5f300..ac24bbb56d 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "config-data.h"
 #include "util.h"
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index d0db059b62..4712d3f7ef 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -45,8 +45,8 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
 #include <glade/glade.h>
+#include <libedataserver/e-time-utils.h>
 #include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
 #include "e-util/e-dialog-widgets.h"
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 88460e0935..32dfa76a4f 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -38,8 +38,8 @@
 #include <gtk/gtkoptionmenu.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
+#include <libedataserver/e-time-utils.h>
 #include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
 #include "e-util/e-dialog-widgets.h"
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 2383f760e0..ed30622df6 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -31,7 +31,7 @@
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "../calendar-config.h"
 #include "../e-date-edit-config.h"
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index a4da4e450c..5d53e50433 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -41,8 +41,8 @@
 #include <gtk/gtkstock.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
+#include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
 #include <misc/e-dateedit.h>
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index eb4fddde8d..13c0537ec3 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -28,7 +28,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <glib.h>
 #include <libecal/e-cal-time-util.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include "calendar-config.h"
 #include "e-alarm-list.h"
 
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index 4210f40a4c..b653d2fdae 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -34,7 +34,7 @@
 #include <libedataserver/e-categories.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <e-util/e-categories-config.h>
 #include "calendar-config.h"
 #include "e-cal-component-memo-preview.h"
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index bb659f3c4a..32f885f634 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -33,7 +33,7 @@
 #include <libecal/e-cal-time-util.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <e-util/e-categories-config.h>
 #include "calendar-config.h"
 #include "e-cal-component-preview.h"
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 02acdd7411..672d8fc809 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib/garray.h>
 #include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "comp-util.h"
 #include "e-cal-model.h"
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index b72330d75c..a0273fc634 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -37,8 +37,8 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock-icons.h> 
 #include <libgnome/gnome-i18n.h>
+#include <libedataserver/e-time-utils.h>
 #include <e-util/e-util.h>
-#include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 
 #include "e-cell-date-edit-text.h"
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index 4ba4a4fcc4..6c498e14b0 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -25,7 +25,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreednd.h>
 #include <glib.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include "e-date-time-list.h"
 #include <libecal/e-cal-time-util.h>
 #include "calendar-config.h"
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 56979ed85b..be4f3e3f61 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -48,7 +48,7 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-html-utils.h>
 #include "dialogs/delete-error.h"
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 5825af0a43..f4c92b9b03 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -29,6 +29,7 @@
 
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
+#include <libedataserver/e-time-utils.h>
 #include <table/e-table-scrolled.h>
 #include <widgets/menus/gal-view-instance.h>
 #include <widgets/menus/gal-view-factory-etable.h>
@@ -37,7 +38,6 @@
 #include "e-util/e-error.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-config-listener.h"
-#include "e-util/e-time-utils.h"
 #include "shell/e-user-creatable-items-handler.h"
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-url.h>
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 72b3ba9435..d2fb77912a 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -28,6 +28,7 @@
 
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
+#include <libedataserver/e-time-utils.h>
 #include <table/e-table-scrolled.h>
 #include <widgets/menus/gal-view-instance.h>
 #include <widgets/menus/gal-view-factory-etable.h>
@@ -36,7 +37,6 @@
 #include "e-util/e-error.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-config-listener.h"
-#include "e-util/e-time-utils.h"
 #include "shell/e-user-creatable-items-handler.h"
 #include <libedataserver/e-url.h>
 #include <libedataserver/e-categories.h>
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 2b203b98a8..4230b9b8be 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -28,12 +28,12 @@
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-moniker-util.h>
 #include <libgnome/gnome-i18n.h>
+#include <libedataserver/e-time-utils.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkwidget.h>
 #include <libical/ical.h>
 #include <Evolution-Composer.h>
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-util.h>
 #include <libsoup/soup-session-async.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 3930949269..91f7480a6d 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -44,9 +44,9 @@
 #include <libgnomeprintui/gnome-print-paper-selector.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
+#include <libedataserver/e-time-utils.h>
 #include <e-util/e-util.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
 #include <e-util/e-print.h>
 #include <libecal/e-cal-time-util.h>
 #include "calendar-commands.h"