aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook-view.c2
-rw-r--r--addressbook/gui/component/addressbook.c2
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/common/authentication.c2
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c2
-rw-r--r--calendar/gui/alarm-notify/notify-main.c2
-rw-r--r--calendar/gui/dialogs/url-editor-dialog.c2
-rw-r--r--calendar/gui/e-pub-utils.c2
-rw-r--r--calendar/gui/itip-utils.c1
-rw-r--r--configure.in2
-rw-r--r--e-util/ChangeLog8
-rw-r--r--e-util/Makefile.am2
-rw-r--r--e-util/e-passwords.c951
-rw-r--r--e-util/e-passwords.h71
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-config.c3
-rw-r--r--mail/mail-session.c2
-rw-r--r--plugins/groupwise-account-setup/ChangeLog4
-rw-r--r--plugins/groupwise-account-setup/camel-gw-listener.c2
-rw-r--r--plugins/send-options/ChangeLog4
-rw-r--r--plugins/send-options/send-options.c2
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-window-commands.c3
-rw-r--r--shell/e-shell.c3
-rw-r--r--shell/main.c3
-rw-r--r--smime/ChangeLog6
-rw-r--r--smime/gui/component.c2
-rw-r--r--smime/lib/e-cert-db.c2
-rw-r--r--smime/lib/e-pkcs12.c2
31 files changed, 76 insertions, 1043 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dd6ee3629..8af1e8e4b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * configure.in: Make mailer depend on libedataserverui.
+
2005-02-22 Marco Pesenti Gritti <marco@gnome.org>
* configure.in: Depend on gnome-vfs >= 2.4
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 84087339e0..f9ab5ff630 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * gui/component/addressbook-view.c:
+ * gui/component/addressbook.c: Include
+ <libedataserverui/e-passwords.h>.
+
2005-02-19 Sivaiah Nallagatla <snallagatla@novell.com>
* gui/contact-editor/eab-editor.c
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index f8b4802c0d..c4dcc00d40 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -40,13 +40,13 @@
#include <bonobo/bonobo-exception.h>
#include <gal/util/e-util.h>
#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/e-passwords.h>
#include "widgets/misc/e-error.h"
#include "widgets/misc/e-task-bar.h"
#include "widgets/misc/e-info-label.h"
-#include "e-util/e-passwords.h"
#include "e-util/e-icon-factory.h"
#include "shell/e-user-creatable-items-handler.h"
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index b389cfa78c..699a44ba06 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -27,8 +27,8 @@
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
#include <libebook/e-book.h>
+#include <libedataserverui/e-passwords.h>
-#include "e-util/e-passwords.h"
#include "widgets/misc/e-error.h"
#include "addressbook.h"
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"
diff --git a/configure.in b/configure.in
index 589bf056c8..a4afe54c27 100644
--- a/configure.in
+++ b/configure.in
@@ -1216,7 +1216,7 @@ fi
dnl --- evolution-mail flags
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 27270c5e2f..f88a68649d 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * Makefile.am (eutilinclude_HEADERS)
+ (libeutil_la_SOURCES): Remove e-passwords from here, it now
+ lives in libedataserverui.
+
+ * e-passwords.[ch]: Removed.
+
2005-02-10 Not Zed <NotZed@Ximian.com>
** See bug #61363 & mail/ChangeLog
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 6ae1ffc80d..a33041d5e0 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -42,7 +42,6 @@ eutilinclude_HEADERS = \
e-list.h \
e-menu.h \
e-mktemp.h \
- e-passwords.h \
e-print.h \
e-plugin.h \
e-popup.h \
@@ -80,7 +79,6 @@ libeutil_la_SOURCES = \
e-list.c \
e-menu.c \
e-mktemp.c \
- e-passwords.c \
e-plugin.c \
e-popup.c \
e-print.c \
diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c
deleted file mode 100644
index a3719726d9..0000000000
--- a/e-util/e-passwords.c
+++ /dev/null
@@ -1,951 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-passwords.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-/*
- * This looks a lot more complicated than it is, and than you'd think
- * it would need to be. There is however, method to the madness.
- *
- * The code most cope with being called from any thread at any time,
- * recursively from the main thread, and then serialising every
- * request so that sane and correct values are always returned, and
- * duplicate requests are never made.
- *
- * To this end, every call is marshalled and queued and a dispatch
- * method invoked until that request is satisfied. If mainloop
- * recursion occurs, then the sub-call will necessarily return out of
- * order, but will not be processed out of order.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <libgnome/gnome-config.h>
-#include <libgnome/gnome-i18n.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmessagedialog.h>
-
-#include "e-passwords.h"
-#include "libedataserver/e-msgport.h"
-#include "widgets/misc/e-error.h"
-
-#ifndef ENABLE_THREADS
-#define ENABLE_THREADS (1)
-#endif
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-static pthread_t main_thread;
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-#define LOCK() pthread_mutex_lock(&lock)
-#define UNLOCK() pthread_mutex_unlock(&lock)
-#else
-#define LOCK()
-#define UNLOCK()
-#endif
-
-struct _EPassMsg {
- EMsg msg;
-
- void (*dispatch)(struct _EPassMsg *);
-
- /* input */
- struct _GtkWindow *parent;
- const char *component;
- const char *key;
- const char *title;
- const char *prompt;
- const char *oldpass;
- guint32 flags;
-
- /* output */
- gboolean *remember;
- char *password;
-
- /* work variables */
- GtkWidget *entry;
- GtkWidget *check;
- int ismain:1;
- int noreply:1; /* supress replies; when calling
- * dispatch functions from others */
-};
-
-typedef struct _EPassMsg EPassMsg;
-
-static GHashTable *passwords = NULL;
-static GtkDialog *password_dialog;
-static EDList request_list = E_DLIST_INITIALISER(request_list);
-static int idle_id;
-static int ep_online_state = TRUE;
-
-static char *decode_base64 (char *base64);
-static int base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save);
-static int base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save);
-
-static gboolean
-ep_idle_dispatch(void *data)
-{
- EPassMsg *msg;
-
- /* As soon as a password window is up we stop; it will
- re-invoke us when it has been closed down */
- LOCK();
- while (password_dialog == NULL && (msg = (EPassMsg *)e_dlist_remhead(&request_list))) {
- UNLOCK();
-
- msg->dispatch(msg);
-
- LOCK();
- }
-
- idle_id = 0;
- UNLOCK();
-
- return FALSE;
-}
-
-static EPassMsg *
-ep_msg_new(void (*dispatch)(EPassMsg *))
-{
- EPassMsg *msg;
-
- e_passwords_init();
-
- msg = g_malloc0(sizeof(*msg));
- msg->dispatch = dispatch;
- msg->msg.reply_port = e_msgport_new();
-#ifdef ENABLE_THREADS
- msg->ismain = pthread_self() == main_thread;
-#else
- msg->ismain = TRUE;
-#endif
- return msg;
-}
-
-static void
-ep_msg_free(EPassMsg *msg)
-{
- e_msgport_destroy(msg->msg.reply_port);
- g_free(msg->password);
- g_free(msg);
-}
-
-static void
-ep_msg_send(EPassMsg *msg)
-{
- int needidle = 0;
-
- LOCK();
- e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
- if (!idle_id) {
- if (!msg->ismain)
- idle_id = g_idle_add(ep_idle_dispatch, NULL);
- else
- needidle = 1;
- }
- UNLOCK();
-
- if (msg->ismain) {
- EPassMsg *m;
-
- if (needidle)
- ep_idle_dispatch(NULL);
- while ((m = (EPassMsg *)e_msgport_get(msg->msg.reply_port)) == NULL)
- g_main_context_iteration(NULL, TRUE);
- g_assert(m == msg);
- } else {
- e_msgport_wait(msg->msg.reply_port);
- g_assert(e_msgport_get(msg->msg.reply_port) == &msg->msg);
- }
-}
-
-/* the functions that actually do the work */
-static void
-ep_clear_passwords(EPassMsg *msg)
-{
- char *path;
-
- path = g_strdup_printf ("/Evolution/Passwords-%s", msg->component);
-
- gnome_config_private_clean_section (path);
- gnome_config_private_sync_file ("/Evolution");
-
- g_free (path);
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-}
-
-static gboolean
-free_entry (gpointer key, gpointer value, gpointer user_data)
-{
- g_free (key);
- memset (value, 0, strlen (value));
- g_free (value);
- return TRUE;
-}
-
-static void
-ep_forget_passwords(EPassMsg *msg)
-{
- void *it;
- char *key;
-
- it = gnome_config_private_init_iterator_sections("/Evolution");
- while ( (it = gnome_config_iterator_next(it, &key, NULL)) ) {
- if (0 == strncmp(key, "Passwords-", 10)) {
- char *section = g_strdup_printf("/Evolution/%s", key);
-
- gnome_config_private_clean_section (section);
- g_free(section);
- }
- g_free(key);
- }
-
- gnome_config_private_sync_file ("/Evolution");
-
- /* free up the session passwords */
- g_hash_table_foreach_remove (passwords, free_entry, NULL);
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-}
-
-static char *
-password_path (const char *component_name, const char *key)
-{
- char *keycopy, *path;
- int i;
- keycopy = g_strdup (key);
-
- for (i = 0; i < strlen (keycopy); i ++)
- if (keycopy[i] == '/' || keycopy[i] =='=')
- keycopy[i] = '_';
-
- path = g_strdup_printf ("/Evolution/Passwords-%s/%s", component_name, keycopy);
-
- g_free (keycopy);
-
- return path;
-}
-
-static void
-ep_remember_password(EPassMsg *msg)
-{
- gpointer okey, value;
- char *path, *pass64;
- int len, state, save;
-
- if (g_hash_table_lookup_extended (passwords, msg->key, &okey, &value)) {
- /* add it to the on-disk cache of passwords */
- path = password_path (msg->component, okey);
-
- len = strlen (value);
- pass64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
- state = save = 0;
- base64_encode_close (value, len, FALSE, pass64, &state, &save);
-
- gnome_config_private_set_string (path, pass64);
- g_free (path);
- g_free (pass64);
-
- /* now remove it from our session hash */
- g_hash_table_remove (passwords, msg->key);
- g_free (okey);
- g_free (value);
-
- gnome_config_private_sync_file ("/Evolution");
- }
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-}
-
-static void
-ep_forget_password (EPassMsg *msg)
-{
- gpointer okey, value;
- char *path;
-
- if (g_hash_table_lookup_extended (passwords, msg->key, &okey, &value)) {
- g_hash_table_remove (passwords, msg->key);
- memset (value, 0, strlen (value));
- g_free (okey);
- g_free (value);
- }
-
- /* clear it in the on disk db */
- path = password_path (msg->component, msg->key);
- gnome_config_private_clean_key (path);
- gnome_config_private_sync_file ("/Evolution");
- g_free (path);
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-}
-
-static void
-ep_get_password (EPassMsg *msg)
-{
- char *path, *passwd;
- char *encoded = NULL;
-
- passwd = g_hash_table_lookup (passwords, msg->key);
- if (passwd) {
- msg->password = g_strdup(passwd);
- } else {
- /* not part of the session hash, look it up in the on disk db */
- path = password_path (msg->component, msg->key);
- encoded = gnome_config_private_get_string_with_default (path, NULL);
- g_free (path);
- if (encoded) {
- msg->password = decode_base64 (encoded);
- g_free (encoded);
- }
- }
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-}
-
-static void
-ep_add_password (EPassMsg *msg)
-{
- gpointer okey, value;
-
- if (g_hash_table_lookup_extended (passwords, msg->key, &okey, &value)) {
- g_hash_table_remove (passwords, msg->key);
- g_free (okey);
- g_free (value);
- }
-
- g_hash_table_insert (passwords, g_strdup (msg->key), g_strdup (msg->oldpass));
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-}
-
-static void ep_ask_password(EPassMsg *msg);
-
-static void
-pass_response(GtkDialog *dialog, int response, void *data)
-{
- EPassMsg *msg = data;
- int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
- EDList pending = E_DLIST_INITIALISER(pending);
- EPassMsg *mw, *mn;
-
- if (response == GTK_RESPONSE_OK) {
- msg->password = g_strdup(gtk_entry_get_text((GtkEntry *)msg->entry));
-
- if (type != E_PASSWORDS_REMEMBER_NEVER) {
- int noreply = msg->noreply;
-
- *msg->remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msg->check));
-
- msg->noreply = 1;
-
- if (*msg->remember || type == E_PASSWORDS_REMEMBER_FOREVER) {
- msg->oldpass = msg->password;
- ep_add_password(msg);
- }
-
- if (*msg->remember && type == E_PASSWORDS_REMEMBER_FOREVER)
- ep_remember_password(msg);
-
- msg->noreply = noreply;
- }
- }
-
- gtk_widget_destroy((GtkWidget *)dialog);
- password_dialog = NULL;
-
- /* ok, here things get interesting, we suck up any pending
- * operations on this specific password, and return the same
- * result or ignore other operations */
-
- LOCK();
- mw = (EPassMsg *)request_list.head;
- mn = (EPassMsg *)mw->msg.ln.next;
- while (mn) {
- if ((mw->dispatch == ep_forget_password
- || mw->dispatch == ep_get_password
- || mw->dispatch == ep_ask_password)
- && (strcmp(mw->component, msg->component) == 0
- && strcmp(mw->key, msg->key) == 0)) {
- e_dlist_remove((EDListNode *)mw);
- mw->password = g_strdup(msg->password);
- e_msgport_reply(&mw->msg);
- }
- mw = mn;
- mn = (EPassMsg *)mn->msg.ln.next;
- }
- UNLOCK();
-
- if (!msg->noreply)
- e_msgport_reply(&msg->msg);
-
- ep_idle_dispatch(NULL);
-}
-
-static void
-ep_ask_password(EPassMsg *msg)
-{
- GtkWidget *vbox;
- int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
- int noreply = msg->noreply;
- AtkObject *a11y;
-
- msg->noreply = 1;
-
- /*password_dialog = (GtkDialog *)e_error_new(msg->parent, "mail:ask-session-password", msg->prompt, NULL);*/
- password_dialog = (GtkDialog *)gtk_message_dialog_new (msg->parent,
- 0,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_OK_CANCEL,
- "%s", msg->prompt);
- gtk_window_set_title(GTK_WINDOW(password_dialog), msg->title);
-
- gtk_widget_ensure_style (GTK_WIDGET (password_dialog));
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (password_dialog)->vbox), 0);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (password_dialog)->action_area), 12);
-
-#if !GTK_CHECK_VERSION (2,4,0)
- gtk_dialog_set_has_separator(password_dialog, FALSE);
-#endif
- gtk_dialog_set_default_response(password_dialog, GTK_RESPONSE_OK);
-
- vbox = gtk_vbox_new (FALSE, 12);
- gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), vbox, TRUE, FALSE, 0);
- gtk_container_set_border_width((GtkContainer *)vbox, 12);
-
- msg->entry = gtk_entry_new ();
-
- a11y = gtk_widget_get_accessible (msg->entry);
- atk_object_set_description (a11y, msg->prompt);
- gtk_entry_set_visibility ((GtkEntry *)msg->entry, !(msg->flags & E_PASSWORDS_SECRET));
- gtk_entry_set_activates_default((GtkEntry *)msg->entry, TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), msg->entry, TRUE, FALSE, 3);
- gtk_widget_show (msg->entry);
- gtk_widget_grab_focus (msg->entry);
-
- if ((msg->flags & E_PASSWORDS_REPROMPT)) {
- ep_get_password(msg);
- if (msg->password) {
- gtk_entry_set_text ((GtkEntry *) msg->entry, msg->password);
- g_free (msg->password);
- msg->password = NULL;
- }
- }
-
- /* static password, shouldn't be remembered between sessions,
- but will be remembered within the session beyond our control */
- if (type != E_PASSWORDS_REMEMBER_NEVER) {
- msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER
- ? _("_Remember this password")
- : _("_Remember this password for the remainder of this session"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (msg->check), *msg->remember);
- gtk_box_pack_start (GTK_BOX (vbox), msg->check, TRUE, FALSE, 3);
- gtk_widget_show (msg->check);
- }
-
- msg->noreply = noreply;
-
- g_signal_connect(password_dialog, "response", G_CALLBACK (pass_response), msg);
- gtk_widget_show((GtkWidget *)password_dialog);
-}
-
-
-/**
- * e_passwords_init:
- *
- * Initializes the e_passwords routines. Must be called before any other
- * e_passwords_* function.
- **/
-void
-e_passwords_init (void)
-{
- LOCK();
-
- if (!passwords) {
- /* create the per-session hash table */
- passwords = g_hash_table_new (g_str_hash, g_str_equal);
-#ifdef ENABLE_THREADS
- main_thread = pthread_self();
-#endif
- }
-
- UNLOCK();
-}
-
-/**
- * e_passwords_cancel:
- *
- * Cancel any outstanding password operations and close any dialogues
- * currently being shown.
- **/
-void
-e_passwords_cancel(void)
-{
- EPassMsg *msg;
-
- LOCK();
- while ((msg = (EPassMsg *)e_dlist_remhead(&request_list)))
- e_msgport_reply(&msg->msg);
- UNLOCK();
-
- if (password_dialog)
- gtk_widget_destroy((GtkWidget *)password_dialog);
-}
-
-/**
- * e_passwords_shutdown:
- *
- * Cleanup routine to call before exiting.
- **/
-void
-e_passwords_shutdown (void)
-{
- /* shouldn't need this really - everything is synchronous */
- gnome_config_private_sync_file ("/Evolution");
-
- e_passwords_cancel();
-
- if (passwords) {
- /* and destroy our per session hash */
- g_hash_table_foreach_remove (passwords, free_entry, NULL);
- g_hash_table_destroy (passwords);
- passwords = NULL;
- }
-}
-
-/**
- * e_passwords_set_online:
- * @state:
- *
- * Set the offline-state of the application. This is a work-around
- * for having the backends fully offline aware, and returns a
- * cancellation response instead of prompting for passwords.
- *
- * FIXME: This is not a permanent api, review post 2.0.
- **/
-void
-e_passwords_set_online(int state)
-{
- ep_online_state = state;
- /* TODO: we could check that a request is open and close it, or maybe who cares */
-}
-
-/**
- * e_passwords_forget_passwords:
- *
- * Forgets all cached passwords, in memory and on disk.
- **/
-void
-e_passwords_forget_passwords (void)
-{
- EPassMsg *msg = ep_msg_new(ep_forget_passwords);
-
- ep_msg_send(msg);
- ep_msg_free(msg);
-}
-
-/**
- * e_passwords_clear_passwords:
- *
- * Forgets all disk cached passwords for the component.
- **/
-void
-e_passwords_clear_passwords (const char *component_name)
-{
- EPassMsg *msg = ep_msg_new(ep_clear_passwords);
-
- msg->component = component_name;
- ep_msg_send(msg);
- ep_msg_free(msg);
-}
-
-/**
- * e_passwords_remember_password:
- * @key: the key
- *
- * Saves the password associated with @key to disk.
- **/
-void
-e_passwords_remember_password (const char *component_name, const char *key)
-{
- EPassMsg *msg;
-
- g_return_if_fail(component_name != NULL);
- g_return_if_fail(key != NULL);
-
- msg = ep_msg_new(ep_remember_password);
-
- msg->component = component_name;
- msg->key = key;
-
- ep_msg_send(msg);
- ep_msg_free(msg);
-}
-
-/**
- * e_passwords_forget_password:
- * @key: the key
- *
- * Forgets the password associated with @key, in memory and on disk.
- **/
-void
-e_passwords_forget_password (const char *component_name, const char *key)
-{
- EPassMsg *msg;
-
- g_return_if_fail(component_name != NULL);
- g_return_if_fail(key != NULL);
-
- msg = ep_msg_new(ep_forget_password);
-
- msg->component = component_name;
- msg->key = key;
-
- ep_msg_send(msg);
- ep_msg_free(msg);
-}
-
-/**
- * e_passwords_get_password:
- * @key: the key
- *
- * Return value: the password associated with @key, or %NULL. Caller
- * must free the returned password.
- **/
-char *
-e_passwords_get_password (const char *component_name, const char *key)
-{
- EPassMsg *msg;
- char *passwd;
-
- g_return_val_if_fail(component_name != NULL, NULL);
- g_return_val_if_fail(key != NULL, NULL);
-
- msg = ep_msg_new(ep_get_password);
-
- msg->component = component_name;
- msg->key = key;
-
- ep_msg_send(msg);
-
- passwd = msg->password;
- msg->password = NULL;
- ep_msg_free(msg);
-
- return passwd;
-}
-
-/**
- * e_passwords_add_password:
- * @key: a key
- * @passwd: the password for @key
- *
- * This stores the @key/@passwd pair in the current session's password
- * hash.
- **/
-void
-e_passwords_add_password (const char *key, const char *passwd)
-{
- EPassMsg *msg;
-
- g_return_if_fail(key != NULL);
- g_return_if_fail(passwd != NULL);
-
- msg = ep_msg_new(ep_add_password);
- msg->key = key;
- msg->oldpass = passwd;
-
- ep_msg_send(msg);
- ep_msg_free(msg);
-}
-
-/**
- * e_passwords_ask_password:
- * @title: title for the password dialog
- * @component_name: the name of the component for which we're storing
- * the password (e.g. Mail, Addressbook, etc.)
- * @key: key to store the password under
- * @prompt: prompt string
- * @secret: whether or not the password text should be ***ed out
- * @remember_type: whether or not to offer to remember the password,
- * and for how long.
- * @remember: on input, the default state of the remember checkbox.
- * on output, the state of the checkbox when the dialog was closed.
- * @parent: parent window of the dialog, or %NULL
- *
- * Asks the user for a password.
- *
- * Return value: the password, which the caller must free, or %NULL if
- * the user cancelled the operation. *@remember will be set if the
- * return value is non-%NULL and @remember_type is not
- * E_PASSWORDS_DO_NOT_REMEMBER.
- **/
-char *
-e_passwords_ask_password (const char *title, const char *component_name,
- const char *key,
- const char *prompt,
- EPasswordsRememberType type,
- gboolean *remember,
- GtkWindow *parent)
-{
- char *passwd;
- EPassMsg *msg = ep_msg_new(ep_ask_password);
-
- if ((type & E_PASSWORDS_ONLINE) && !ep_online_state)
- return NULL;
-
- msg->title = title;
- msg->component = component_name;
- msg->key = key;
- msg->prompt = prompt;
- msg->flags = type;
- msg->remember = remember;
- msg->parent = parent;
-
- ep_msg_send(msg);
- passwd = msg->password;
- msg->password = NULL;
- ep_msg_free(msg);
-
- return passwd;
-}
-
-
-
-static char *base64_alphabet =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static unsigned char camel_mime_base64_rank[256] = {
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255, 0,255,255,
- 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
- 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
- 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-};
-
-/* call this when finished encoding everything, to
- flush off the last little bit */
-static int
-base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save)
-{
- int c1, c2;
- unsigned char *outptr = out;
-
- if (inlen>0)
- outptr += base64_encode_step(in, inlen, break_lines, outptr, state, save);
-
- c1 = ((unsigned char *)save)[1];
- c2 = ((unsigned char *)save)[2];
-
- switch (((char *)save)[0]) {
- case 2:
- outptr[2] = base64_alphabet[ ( (c2 &0x0f) << 2 ) ];
- g_assert(outptr[2] != 0);
- goto skip;
- case 1:
- outptr[2] = '=';
- skip:
- outptr[0] = base64_alphabet[ c1 >> 2 ];
- outptr[1] = base64_alphabet[ c2 >> 4 | ( (c1&0x3) << 4 )];
- outptr[3] = '=';
- outptr += 4;
- break;
- }
- if (break_lines)
- *outptr++ = '\n';
-
- *save = 0;
- *state = 0;
-
- return outptr-out;
-}
-
-/*
- performs an 'encode step', only encodes blocks of 3 characters to the
- output at a time, saves left-over state in state and save (initialise to
- 0 on first invocation).
-*/
-static int
-base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save)
-{
- register unsigned char *inptr, *outptr;
-
- if (len<=0)
- return 0;
-
- inptr = in;
- outptr = out;
-
- if (len + ((char *)save)[0] > 2) {
- unsigned char *inend = in+len-2;
- register int c1, c2, c3;
- register int already;
-
- already = *state;
-
- switch (((char *)save)[0]) {
- case 1: c1 = ((unsigned char *)save)[1]; goto skip1;
- case 2: c1 = ((unsigned char *)save)[1];
- c2 = ((unsigned char *)save)[2]; goto skip2;
- }
-
- /* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */
- while (inptr < inend) {
- c1 = *inptr++;
- skip1:
- c2 = *inptr++;
- skip2:
- c3 = *inptr++;
- *outptr++ = base64_alphabet[ c1 >> 2 ];
- *outptr++ = base64_alphabet[ c2 >> 4 | ( (c1&0x3) << 4 ) ];
- *outptr++ = base64_alphabet[ ( (c2 &0x0f) << 2 ) | (c3 >> 6) ];
- *outptr++ = base64_alphabet[ c3 & 0x3f ];
- /* this is a bit ugly ... */
- if (break_lines && (++already)>=19) {
- *outptr++='\n';
- already = 0;
- }
- }
-
- ((char *)save)[0] = 0;
- len = 2-(inptr-inend);
- *state = already;
- }
-
- if (len>0) {
- register char *saveout;
-
- /* points to the slot for the next char to save */
- saveout = & (((char *)save)[1]) + ((char *)save)[0];
-
- /* len can only be 0 1 or 2 */
- switch(len) {
- case 2: *saveout++ = *inptr++;
- case 1: *saveout++ = *inptr++;
- }
- ((char *)save)[0]+=len;
- }
-
- return outptr-out;
-}
-
-
-/**
- * base64_decode_step: decode a chunk of base64 encoded data
- * @in: input stream
- * @len: max length of data to decode
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- *
- * Decodes a chunk of base64 encoded data
- **/
-static int
-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)
-{
- register unsigned char *inptr, *outptr;
- unsigned char *inend, c;
- register unsigned int v;
- int i;
-
- inend = in+len;
- outptr = out;
-
- /* convert 4 base64 bytes to 3 normal bytes */
- v=*save;
- i=*state;
- inptr = in;
- while (inptr<inend) {
- c = camel_mime_base64_rank[*inptr++];
- if (c != 0xff) {
- v = (v<<6) | c;
- i++;
- if (i==4) {
- *outptr++ = v>>16;
- *outptr++ = v>>8;
- *outptr++ = v;
- i=0;
- }
- }
- }
-
- *save = v;
- *state = i;
-
- /* quick scan back for '=' on the end somewhere */
- /* fortunately we can drop 1 output char for each trailing = (upto 2) */
- i=2;
- while (inptr>in && i) {
- inptr--;
- if (camel_mime_base64_rank[*inptr] != 0xff) {
- if (*inptr == '=')
- outptr--;
- i--;
- }
- }
-
- /* if i!= 0 then there is a truncation error! */
- return outptr-out;
-}
-
-static char *
-decode_base64 (char *base64)
-{
- char *plain, *pad = "==";
- int len, out, state, save;
-
- len = strlen (base64);
- plain = g_malloc0 (len);
- state = save = 0;
- out = base64_decode_step (base64, len, plain, &state, &save);
- if (len % 4) {
- base64_decode_step (pad, 4 - len % 4, plain + out,
- &state, &save);
- }
-
- return plain;
-}
diff --git a/e-util/e-passwords.h b/e-util/e-passwords.h
deleted file mode 100644
index 2bed97f95d..0000000000
--- a/e-util/e-passwords.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * e-passwords.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef _E_PASSWORD_H_
-#define _E_PASSWORD_H_
-
-#include <glib.h>
-#include <gtk/gtkwindow.h>
-
-G_BEGIN_DECLS
-
-/*
- initialization is now implicit when you call any of the functions
- below, although this is only correct if the functions are called
- from the main thread.
-
- e_passwords_shutdown should be called at exit time to synch the
- password on-disk storage, and to free up in-memory storage. */
-void e_passwords_init (void);
-
-void e_passwords_shutdown (void);
-void e_passwords_cancel(void);
-void e_passwords_set_online(int state);
-void e_passwords_remember_password (const char *component, const char *key);
-void e_passwords_add_password (const char *key, const char *passwd);
-char *e_passwords_get_password (const char *component, const char *key);
-void e_passwords_forget_password (const char *component, const char *key);
-void e_passwords_forget_passwords (void);
-void e_passwords_clear_passwords (const char *component);
-
-typedef enum {
- E_PASSWORDS_REMEMBER_NEVER,
- E_PASSWORDS_REMEMBER_SESSION,
- E_PASSWORDS_REMEMBER_FOREVER,
- E_PASSWORDS_REMEMBER_MASK = 0xf,
-
- /* option bits */
- E_PASSWORDS_SECRET = 1<<8,
- E_PASSWORDS_REPROMPT = 1<<9,
- E_PASSWORDS_ONLINE = 1<<10, /* only ask if we're online */
-} EPasswordsRememberType;
-
-char * e_passwords_ask_password (const char *title,
- const char*component_name, const char *key,
- const char *prompt,
- EPasswordsRememberType remember_type,
- gboolean *remember,
- GtkWindow *parent);
-
-G_END_DECLS
-
-#endif /* _E_PASSWORD_H_ */
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1ea189f19b..47f33edc1f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * mail-session.c:
+ * mail-config.c: Include <libedataserverui/e-passwords.h>.
+
2005-02-22 Not Zed <NotZed@Ximian.com>
* em-account-editor.c (emae_send_page): fix argument order to
diff --git a/mail/mail-config.c b/mail/mail-config.c
index a3c2d6819e..413048ccaa 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -54,7 +54,6 @@
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
-#include <e-util/e-passwords.h>
#include <e-util/e-account-list.h>
#include <e-util/e-signature-list.h>
@@ -64,6 +63,8 @@
#include <camel/camel-mime-filter-charset.h>
#include <camel/camel-stream-filter.h>
+#include <libedataserverui/e-passwords.h>
+
#include "mail-component.h"
#include "mail-session.h"
#include "mail-config.h"
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 3ae114b2cd..5b8c2cc9b5 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -52,7 +52,7 @@
#include "mail-tools.h"
#include "mail-mt.h"
#include "mail-ops.h"
-#include "e-util/e-passwords.h"
+#include <libedataserverui/e-passwords.h>
#include "libedataserver/e-msgport.h"
#include "em-junk-filter.h"
#include "widgets/misc/e-error.h"
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 117d263206..b6b47c5a3b 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * camel-gw-listener.c: Include <libedataserverui/e-passwords.h>.
+
2005-01-28 Sivaiah Nallagatla <snallagatla@novell.com>
* camel-gw-listner.c (get_address_book_names_from_server)
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 70b720d506..27f5a3f0f5 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <camel/camel-i18n.h>
#include <e-gw-connection.h>
-#include <e-util/e-passwords.h>
+#include <libedataserverui/e-passwords.h>
#include "widgets/misc/e-error.h"
/*stores some info about all currently existing groupwise accounts
diff --git a/plugins/send-options/ChangeLog b/plugins/send-options/ChangeLog
index 16c3882863..f8f447ee29 100644
--- a/plugins/send-options/ChangeLog
+++ b/plugins/send-options/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * send-options.c: Include <libedataserverui/e-passwords.h>.
+
2005-02-10 Chenthill Palanisamy <pchenthill@novell.com>
* send-options.c: (e_sendoptions_clicked_cb): IF
diff --git a/plugins/send-options/send-options.c b/plugins/send-options/send-options.c
index 823865e617..b5b1885f7c 100644
--- a/plugins/send-options/send-options.c
+++ b/plugins/send-options/send-options.c
@@ -32,9 +32,9 @@
#include <mail/em-config.h>
#include <e-gw-connection.h>
#include <camel/camel-url.h>
-#include "e-util/e-passwords.h"
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-source-list.h>
+#include <libedataserverui/e-passwords.h>
ESendOptionsDialog *sod = NULL;
GtkWidget *parent;
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e63e0331a2..b05a4fae2f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * e-shell-window-commands.c:
+ * e-shell.c:
+ * main.c: Include <libedataserverui/e-passwords.h>.
+
2005-02-22 Marco Pesenti Gritti <marco@gnome.org>
* shell/e-shell-window-commands.c: (command_quick_reference):
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 438e5c50cd..894f2bb431 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -33,7 +33,6 @@
#include "e-util/e-icon-factory.h"
#include "e-util/e-dialog-utils.h"
-#include "e-util/e-passwords.h"
#include <glib/gprintf.h>
@@ -48,6 +47,8 @@
#include <bonobo/bonobo-ui-component.h>
+#include <libedataserverui/e-passwords.h>
+
#include <string.h>
/* Utility functions. */
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 0b77ebcf9f..bd9b332f37 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,7 +32,6 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-bconf-map.h"
#include "e-util/e-fsutils.h"
-#include "e-util/e-passwords.h"
#include "widgets/misc/e-error.h"
#include "e-shell-constants.h"
@@ -66,6 +65,8 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-moniker-util.h>
+#include <libedataserverui/e-passwords.h>
+
#include <gal/util/e-util.h>
#include <gconf/gconf-client.h>
diff --git a/shell/main.c b/shell/main.c
index 43ccb41d6c..ea8a4e974b 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -27,7 +27,6 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-gtk-utils.h"
#include "e-util/e-bconf-map.h"
-#include "e-util/e-passwords.h"
#include <e-util/e-icon-factory.h>
#include "e-shell-constants.h"
@@ -66,6 +65,8 @@
#include <bonobo-activation/bonobo-activation.h>
+#include <libedataserverui/e-passwords.h>
+
#include <glade/glade.h>
#include "e-config-upgrade.h"
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 81d89d061f..605ce5d865 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-23 Hans Petter Jansson <hpj@novell.com>
+
+ * gui/component.c:
+ * lib/e-cert-db.c:
+ * lib/e-pkcs12.c: Include <libedataserverui/e-passwords.h>.
+
2005-02-09 Hans Petter Jansson <hpj@novell.com>
* lib/Makefile.am:
diff --git a/smime/gui/component.c b/smime/gui/component.c
index a433c4032e..152d38fe3e 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -28,10 +28,10 @@
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
+#include <libedataserverui/e-passwords.h>
#include "ca-trust-dialog.h"
#include "e-cert-db.h"
-#include "e-util/e-passwords.h"
#include "pk11func.h"
static gboolean
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 13fdf603a6..d737887e7a 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -83,10 +83,10 @@
#include "plstr.h"
#include "prprf.h"
#include "prmem.h"
-#include "e-util/e-passwords.h"
#include "e-util/e-dialog-utils.h"
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
+#include <libedataserverui/e-passwords.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index b2e8e16698..12be49abc5 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -62,12 +62,12 @@
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
+#include <libedataserverui/e-passwords.h>
#include <time.h>
#include <fcntl.h>
#include <unistd.h>
-#include "e-util/e-passwords.h"
#include "e-cert-db.h"
#include "e-pkcs12.h"