7 files changed, 16 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 624347059f..d3f194533c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-23  Hans Petter Jansson  <hpj@novell.com>
+
+	* common/authentication.c:
+	* gui/e-pub-utils.c:
+	* gui/alarm-notify/alarm-notify.c:
+	* gui/alarm-notify/notify-main.c:
+	* gui/dialogs/url-editor-dialog.c:
+	Include <libedataserverui/e-passwords.h>.
+	* gui/itip-utils.c: Remove e-passwords.h include, it's not
+	needed.
+
 2005-02-23  JP Rosevear  <jpr@novell.com>
 
 	Fixes #70000
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index 4849169e56..69d0e9544c 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 #include <bonobo/bonobo-i18n.h>
-#include "e-util/e-passwords.h"
+#include <libedataserverui/e-passwords.h>
 #include "authentication.h"
 
 static GHashTable *source_lists_hash = NULL;
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index b2208eb77d..f37ccad139 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -26,12 +26,12 @@
 #include <string.h>
 #include <bonobo/bonobo-main.h>
 #include <libedataserver/e-url.h>
+#include <libedataserverui/e-passwords.h>
 #include <libecal/e-cal.h>
 #include "alarm-notify.h"
 #include "alarm-queue.h"
 #include "config-data.h"
 #include "common/authentication.h"
-#include "e-util/e-passwords.h"
 
 
 /* Private part of the AlarmNotify structure */
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 91fc0c0bfe..c679ad41e5 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -38,7 +38,7 @@
 #include <bonobo/bonobo-generic-factory.h>
 #include <bonobo-activation/bonobo-activation.h>
 #include <libedataserver/e-source.h>
-#include "e-util/e-passwords.h"
+#include <libedataserverui/e-passwords.h>
 #include "e-util/e-icon-factory.h"
 #include "alarm.h"
 #include "alarm-queue.h"
diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c
index b6402fd414..1032c264ba 100644
--- a/calendar/gui/dialogs/url-editor-dialog.c
+++ b/calendar/gui/dialogs/url-editor-dialog.c
@@ -34,12 +34,12 @@
 #include "cal-prefs-dialog.h"
 #include "url-editor-dialog.h"
 
-#include "e-util/e-passwords.h"
 #include <gtk/gtk.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtktogglebutton.h>
 #include <libgnomeui/gnome-color-picker.h>
+#include <libedataserverui/e-passwords.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-icon-factory.h>
diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c
index 235ce8d159..90338dd1a6 100644
--- a/calendar/gui/e-pub-utils.c
+++ b/calendar/gui/e-pub-utils.c
@@ -26,9 +26,9 @@
 #include <gconf/gconf-client.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
+#include <libedataserverui/e-passwords.h>
 #include <libecal/e-cal-time-util.h>
 #include <libgnome/gnome-i18n.h>
-#include "e-util/e-passwords.h"
 #include "calendar-config.h"
 #include "common/authentication.h"
 #include "itip-utils.h"
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 5b5091206b..63067aee7c 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -39,7 +39,6 @@
 #include <libsoup/soup-session-async.h>
 #include <libsoup/soup-message.h>
 #include <libsoup/soup-uri.h>
-#include "e-util/e-passwords.h"
 #include "calendar-config.h"
 #include "itip-utils.h"
 #include "dialogs/cal-attachment.h"