removed. Merged to evolution-data-server/libedataserver/. remove above

006-01-06  Simon Zheng <simon.zheng@sun.com>

        * e-account.[ch], e-account-list.[ch]: removed.
        Merged to evolution-data-server/libedataserver/.
        * Makefile.am: remove above files from list.

svn path=/trunk/; revision=31083

6 files changed, 6 insertions, 1756 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 48f9a06486..73b26ece84 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-06  Simon Zheng <simon.zheng@sun.com>
+
+	* e-account.[ch], e-account-list.[ch]: removed. 
+	Merged to evolution-data-server/libedataserver/.
+	* Makefile.am: remove above files from list.
+
 2006-01-05  Tor Lillqvist  <tml@novell.com>
 
 	* e-plugin.c (epl_construct)
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 8e4382dbbf..de817c7c1c 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -39,8 +39,6 @@ INCLUDES =								\
 privsolib_LTLIBRARIES = libeutil.la libeconduit.la
 
 eutilinclude_HEADERS = 				\
-	e-account-list.h			\
-	e-account.h				\
 	e-bconf-map.h				\
 	e-categories-config.h			\
 	e-config.h				\
@@ -80,8 +78,6 @@ eutilinclude_HEADERS = 				\
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
 	e-util-marshal.c			\
-	e-account-list.c			\
-	e-account.c				\
 	e-bconf-map.c				\
 	e-categories-config.c			\
 	e-config.c				\
diff --git a/e-util/e-account-list.c b/e-util/e-account-list.c
deleted file mode 100644
index 29d0183c19..0000000000
--- a/e-util/e-account-list.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-account-list.h"
-#include "e-account.h"
-#include "e-util-marshal.h"
-
-#include <string.h>
-
-struct EAccountListPrivate {
- 	GConfClient *gconf;
-	guint notify_id;
-};
-
-enum {
-	ACCOUNT_ADDED,
-	ACCOUNT_CHANGED,
-	ACCOUNT_REMOVED,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = { 0 };
-
-static void e_account_list_dispose (GObject *);
-static void e_account_list_finalize (GObject *);
-
-G_DEFINE_TYPE (EAccountList, e_account_list, E_TYPE_LIST)
-
-static void
-e_account_list_class_init (EAccountListClass *klass)
-{
-	GObjectClass *object_class;
-	
-	/* virtual method override */
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->dispose = e_account_list_dispose;
-	object_class->finalize = e_account_list_finalize;
-
-	/* signals */
-	signals[ACCOUNT_ADDED] =
-		g_signal_new ("account-added",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EAccountListClass, account_added),
-			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
-			      G_TYPE_NONE, 1,
-			      E_TYPE_ACCOUNT);
-	signals[ACCOUNT_CHANGED] =
-		g_signal_new ("account-changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EAccountListClass, account_changed),
-			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
-			      G_TYPE_NONE, 1,
-			      E_TYPE_ACCOUNT);
-	signals[ACCOUNT_REMOVED] =
-		g_signal_new ("account-removed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EAccountListClass, account_removed),
-			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
-			      G_TYPE_NONE, 1,
-			      E_TYPE_ACCOUNT);
-}
-
-static void
-e_account_list_init (EAccountList *account_list)
-{
-	account_list->priv = g_new0 (EAccountListPrivate, 1);
-}
-
-static void
-e_account_list_dispose (GObject *object)
-{
-	EAccountList *account_list = E_ACCOUNT_LIST (object);
-
-	if (account_list->priv->gconf) {
-		if (account_list->priv->notify_id) {
-			gconf_client_notify_remove (account_list->priv->gconf,
-						    account_list->priv->notify_id);
-		}
-		g_object_unref (account_list->priv->gconf);
-		account_list->priv->gconf = NULL;
-	}
-
-	G_OBJECT_CLASS (e_account_list_parent_class)->dispose (object);
-}
-
-static void
-e_account_list_finalize (GObject *object)
-{
-	EAccountList *account_list = E_ACCOUNT_LIST (object);
-
-	g_free (account_list->priv);
-
-	G_OBJECT_CLASS (e_account_list_parent_class)->finalize (object);
-}
-
-static void
-gconf_accounts_changed (GConfClient *client, guint cnxn_id,
-			GConfEntry *entry, gpointer user_data)
-{
-	EAccountList *account_list = user_data;
-	GSList *list, *l, *new_accounts = NULL;
-	EAccount *account;
-	EList *old_accounts;
-	EIterator *iter;
-	char *uid;
-
-	old_accounts = e_list_duplicate (E_LIST (account_list));
-
-	list = gconf_client_get_list (client, "/apps/evolution/mail/accounts",
-				      GCONF_VALUE_STRING, NULL);
-	for (l = list; l; l = l->next) {
-		uid = e_account_uid_from_xml (l->data);
-		if (!uid)
-			continue;
-
-		/* See if this is an existing account */
-		for (iter = e_list_get_iterator (old_accounts);
-		     e_iterator_is_valid (iter);
-		     e_iterator_next (iter)) {
-			account = (EAccount *)e_iterator_get (iter);
-			if (!strcmp (account->uid, uid)) {
-				/* The account still exists, so remove
-				 * it from "old_accounts" and update it.
-				 */
-				e_iterator_delete (iter);
-				if (e_account_set_from_xml (account, l->data))
-					g_signal_emit (account_list, signals[ACCOUNT_CHANGED], 0, account);
-				goto next;
-			}
-		}
-
-		/* Must be a new account */
-		account = e_account_new_from_xml (l->data);
-		e_list_append (E_LIST (account_list), account);
-		new_accounts = g_slist_prepend (new_accounts, account);
-
-	next:
-		g_free (uid);
-		g_object_unref (iter);
-	}
-
-	/* Now emit signals for each added account. (We do this after
-	 * adding all of them because otherwise if the signal handler
-	 * calls e_account_list_get_default_account() it will end up
-	 * causing the first account in the list to become the
-	 * default.)
-	 */
-	for (l = new_accounts; l; l = l->next) {
-		account = l->data;
-		g_signal_emit (account_list, signals[ACCOUNT_ADDED], 0, account);
-		g_object_unref (account);
-	}
-	g_slist_free (new_accounts);
-
-	/* Anything left in old_accounts must have been deleted */
-	for (iter = e_list_get_iterator (old_accounts);
-	     e_iterator_is_valid (iter);
-	     e_iterator_next (iter)) {
-		account = (EAccount *)e_iterator_get (iter);
-		e_list_remove (E_LIST (account_list), account);
-		g_signal_emit (account_list, signals[ACCOUNT_REMOVED], 0, account);
-	}
-	g_object_unref (iter);
-	g_object_unref (old_accounts);
-}
-
-static void *
-copy_func (const void *data, void *closure)
-{
-	GObject *object = (GObject *)data;
-
-	g_object_ref (object);
-	return object;
-}
-
-static void
-free_func (void *data, void *closure)
-{
-	g_object_unref (data);
-}
-
-/**
- * e_account_list_new:
- * @gconf: a #GConfClient
- *
- * Reads the list of accounts from @gconf and listens for changes.
- * Will emit %account_added, %account_changed, and %account_removed
- * signals according to notifications from GConf.
- *
- * You can modify the list using e_list_append(), e_list_remove(), and
- * e_iterator_delete(). After adding, removing, or changing accounts,
- * you must call e_account_list_save() to push the changes back to
- * GConf.
- *
- * Return value: the list of accounts
- **/
-EAccountList *
-e_account_list_new (GConfClient *gconf)
-{
-	EAccountList *account_list;
-
-	g_return_val_if_fail (GCONF_IS_CLIENT (gconf), NULL);
-
-	account_list = g_object_new (E_TYPE_ACCOUNT_LIST, NULL);
-	e_account_list_construct (account_list, gconf);
-
-	return account_list;
-}
-
-void
-e_account_list_construct (EAccountList *account_list, GConfClient *gconf)
-{
-	g_return_if_fail (GCONF_IS_CLIENT (gconf));
-
-	e_list_construct (E_LIST (account_list), copy_func, free_func, NULL);
-	account_list->priv->gconf = gconf;
-	g_object_ref (gconf);
-
-	gconf_client_add_dir (account_list->priv->gconf,
-			      "/apps/evolution/mail/accounts",
-			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	account_list->priv->notify_id =
-		gconf_client_notify_add (account_list->priv->gconf,
-					 "/apps/evolution/mail/accounts",
-					 gconf_accounts_changed, account_list,
-					 NULL, NULL);
-
-	gconf_accounts_changed (account_list->priv->gconf,
-				account_list->priv->notify_id,
-				NULL, account_list);
-}
-
-/**
- * e_account_list_save:
- * @account_list: an #EAccountList
- *
- * Saves @account_list to GConf. Signals will be emitted for changes.
- **/
-void
-e_account_list_save (EAccountList *account_list)
-{
-	GSList *list = NULL;
-	EAccount *account;
-	EIterator *iter;
-	char *xmlbuf;
-
-	for (iter = e_list_get_iterator (E_LIST (account_list));
-	     e_iterator_is_valid (iter);
-	     e_iterator_next (iter)) {
-		account = (EAccount *)e_iterator_get (iter);
-
-		xmlbuf = e_account_to_xml (account);
-		if (xmlbuf)
-			list = g_slist_append (list, xmlbuf);
-	}
-	g_object_unref (iter);
-
-	gconf_client_set_list (account_list->priv->gconf,
-			       "/apps/evolution/mail/accounts",
-			       GCONF_VALUE_STRING, list, NULL);
-
-	while (list) {
-		g_free (list->data);
-		list = g_slist_remove (list, list->data);
-	}
-
-	gconf_client_suggest_sync (account_list->priv->gconf, NULL);
-}
-
-void 
-e_account_list_prune_proxies (EAccountList *account_list)
-{
-	EAccount *account;
-	EIterator *iter;
-	
-	for (iter = e_list_get_iterator (E_LIST (account_list));
-	     e_iterator_is_valid (iter);
-	     e_iterator_next (iter)) {
-		account = (EAccount *)e_iterator_get (iter);
-		if (account->parent_uid) 
-			e_account_list_remove (account_list, account);
-	}
-
-	e_account_list_save (account_list);
-	g_object_unref (iter);
-}
-
-void 
-e_account_list_remove_account_proxies (EAccountList *accounts, EAccount *account)
-{
-	EAccount *child_account;
-
-	while ( (child_account = (EAccount *)e_account_list_find (accounts, E_ACCOUNT_FIND_PARENT_UID, account->uid))) {
-		e_account_list_remove (accounts, child_account);
-		child_account = NULL;
-	}
-
-	e_account_list_save (accounts);
-}
-
-int
-e_account_list_account_has_proxies (EAccountList *accounts, EAccount *account)
-{
-	if (e_account_list_find (accounts, E_ACCOUNT_FIND_PARENT_UID, account->uid))
-		return TRUE;
-
-	return FALSE;
-}
-/**
- * e_account_list_add:
- * @accounts: 
- * @account: 
- * 
- * Add an account to the account list.  Will emit the account-changed
- * event.
- **/
-void
-e_account_list_add(EAccountList *accounts, EAccount *account)
-{
-	/* FIXME: should we check for duplicate accounts? */
-
-	e_list_append ((EList *)accounts, account);
-	g_signal_emit(accounts, signals[ACCOUNT_ADDED], 0, account);
-}
-
-/**
- * e_account_list_change:
- * @accounts: 
- * @account: 
- * 
- * Signal that the details of an account have changed.
- **/
-void
-e_account_list_change(EAccountList *accounts, EAccount *account)
-{
-	/* maybe the account should do this itself ... */
-	g_signal_emit(accounts, signals[ACCOUNT_CHANGED], 0, account);
-}
-
-/**
- * e_account_list_remove:
- * @accounts: 
- * @account: 
- * 
- * Remove an account from the account list, and emit the
- * account-removed signal.  If the account was the default account,
- * then reset the default to the first account.
- **/
-void
-e_account_list_remove(EAccountList *accounts, EAccount *account)
-{
-	if (account == e_account_list_get_default(accounts))
-		gconf_client_unset (accounts->priv->gconf, "/apps/evolution/mail/default_account", NULL);
-
-	/* not sure if need to ref but no harm */
-	g_object_ref (account);
-	e_list_remove ((EList *) accounts, account);
-	g_signal_emit(accounts, signals[ACCOUNT_REMOVED], 0, account);
-	g_object_unref (account);
-}
-
-/**
- * e_account_list_get_default:
- * @accounts: 
- * 
- * Get the default account.  If no default is specified, or the default
- * has become stale, then the first account is made the default.
- * 
- * Return value: The account or NULL if no accounts are defined.
- **/
-const EAccount *
-e_account_list_get_default(EAccountList *accounts)
-{
-	char *uid;
-	EIterator *it;
-	const EAccount *account = NULL;
-
-	uid = gconf_client_get_string (accounts->priv->gconf, "/apps/evolution/mail/default_account", NULL);
-	it = e_list_get_iterator ((EList *)accounts);
-
-	if (uid) {
-		for (;e_iterator_is_valid (it);e_iterator_next (it)) {
-			account = (const EAccount *)e_iterator_get (it);
-
-			if (!strcmp(uid, account->uid))
-				break;
-			account = NULL;
-		}
-		e_iterator_reset(it);
-	}
-
-	/* no uid or uid not found, @it will be at the first account */
-	if (account == NULL && e_iterator_is_valid(it)) {
-		account = (const EAccount *) e_iterator_get (it);
-		gconf_client_set_string (accounts->priv->gconf, "/apps/evolution/mail/default_account", account->uid, NULL);
-	}
-
-	g_object_unref(it);
-	g_free(uid);
-
-	return account;
-}
-
-/**
- * e_account_list_set_default:
- * @accounts: 
- * @account: 
- * 
- * Set the account @account to be the default account.
- **/
-void
-e_account_list_set_default(EAccountList *accounts, EAccount *account)
-{
-	gconf_client_set_string (accounts->priv->gconf, "/apps/evolution/mail/default_account", account->uid, NULL);
-}
-
-/**
- * e_account_list_find:
- * @accounts: 
- * @type: Type of search.
- * @key: Search key.
- * 
- * Perform a search of the account list on a single key.
- *
- * @type must be set from one of the following search types:
- * E_ACCOUNT_FIND_NAME - Find an account by account name.
- * E_ACCOUNT_FIND_ID_NAME - Find an account by the owner's identity name.
- * E_ACCOUNT_FIND_ID_ADDRESS - Find an account by the owner's identity address.
- * 
- * Return value: The account or NULL if it doesn't exist.
- **/
-const EAccount *
-e_account_list_find(EAccountList *accounts, e_account_find_t type, const char *key)
-{
-	char *val;
-	EIterator *it;
-	const EAccount *account = NULL;
-
-	/* this could use a callback for more flexibility ...
-	   ... but this makes the common cases easier */
-
-	if (!key)
-		return NULL;
-	
-	for (it = e_list_get_iterator ((EList *)accounts);
-	     e_iterator_is_valid (it);
-	     e_iterator_next (it)) {
-		int found = 0;
-
-		account = (const EAccount *)e_iterator_get (it);
-
-		val = NULL;
-		switch(type) {
-		case E_ACCOUNT_FIND_NAME:
-			found = strcmp(account->name, key) == 0;
-			break;
-		case E_ACCOUNT_FIND_UID:
-			found = strcmp(account->uid, key) == 0;
-			break;
-		case E_ACCOUNT_FIND_ID_NAME:
-			if (account->id)
-				found = strcmp(account->id->name, key) == 0;
-			break;
-		case E_ACCOUNT_FIND_ID_ADDRESS:
-			if (account->id)
-				found = g_ascii_strcasecmp(account->id->address, key) == 0;
-			break;
-		case E_ACCOUNT_FIND_PARENT_UID:
-			if (account->parent_uid)
-				found = strcmp(account->parent_uid, key) == 0;
-			break;
-		}
-
-		if (found)
-			break;
-
-		account = NULL;
-	}
-	g_object_unref(it);
-
-	return account;
-}
-
diff --git a/e-util/e-account-list.h b/e-util/e-account-list.h
deleted file mode 100644
index 2b1a097d1f..0000000000
--- a/e-util/e-account-list.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_ACCOUNT_LIST__
-#define __E_ACCOUNT_LIST__
-
-#include <libedataserver/e-list.h> 
-#include "e-account.h"
-#include <gconf/gconf-client.h>
-
-#define E_TYPE_ACCOUNT_LIST            (e_account_list_get_type ())
-#define E_ACCOUNT_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ACCOUNT_LIST, EAccountList))
-#define E_ACCOUNT_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ACCOUNT_LIST, EAccountListClass))
-#define E_IS_ACCOUNT_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ACCOUNT_LIST))
-#define E_IS_ACCOUNT_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ACCOUNT_LIST))
-
-typedef struct EAccountListPrivate EAccountListPrivate;
-
-/* search options for the find command */
-typedef enum _e_account_find_t {
-	E_ACCOUNT_FIND_NAME,
-	E_ACCOUNT_FIND_UID,
-	E_ACCOUNT_FIND_ID_NAME,
-	E_ACCOUNT_FIND_ID_ADDRESS,
-	E_ACCOUNT_FIND_PARENT_UID,
-} e_account_find_t;
-
-typedef struct _EAccountList {
-	EList parent_object;
-
-	EAccountListPrivate *priv;
-} EAccountList;
-
-typedef struct {
-	EListClass parent_class;
-
-	/* signals */
-	void (*account_added)   (EAccountList *, EAccount *);
-	void (*account_changed) (EAccountList *, EAccount *);
-	void (*account_removed) (EAccountList *, EAccount *);
-} EAccountListClass;
-
-
-GType           e_account_list_get_type (void);
-
-EAccountList   *e_account_list_new       (GConfClient  *gconf);
-void            e_account_list_construct (EAccountList *account_list,
-					  GConfClient  *gconf);
-
-void            e_account_list_save      (EAccountList *account_list);
-
-void            e_account_list_add       (EAccountList *, EAccount *);
-void            e_account_list_change    (EAccountList *, EAccount *);
-void            e_account_list_remove    (EAccountList *, EAccount *);
-
-const EAccount *e_account_list_get_default(EAccountList *);
-void            e_account_list_set_default(EAccountList *, EAccount *);
-const EAccount *e_account_list_find       (EAccountList *, e_account_find_t type, const char *key);
-
-void e_account_list_prune_proxies (EAccountList *);
-void e_account_list_remove_account_proxies (EAccountList *, EAccount *);
-int e_account_list_account_has_proxies (EAccountList *, EAccount *);
-
-#endif /* __E_ACCOUNT_LIST__ */
diff --git a/e-util/e-account.c b/e-util/e-account.c
deleted file mode 100644
index af505b1784..0000000000
--- a/e-util/e-account.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-account.h"
-
-#include <libedataserver/e-uid.h>
-
-#include <string.h>
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xmlmemory.h>
-
-#include <gconf/gconf-client.h>
-
-#define d(x)
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (EAccount, e_account, G_TYPE_OBJECT)
-
-/*
-lock mail accounts	Relatively difficult -- involves redesign of the XML blobs which describe accounts
-disable adding mail accounts	Simple -- can be done with just a Gconf key and some UI work to make assoc. widgets unavailable
-disable editing mail accounts	Relatively difficult -- involves redesign of the XML blobs which describe accounts
-disable removing mail accounts	
-lock default character encoding	Simple -- Gconf key + a little UI work to desensitize widgets, etc
-disable free busy publishing	
-disable specific mime types (from being viewed)	90% done already (Unknown MIME types still pose a problem)
-lock image loading preference	
-lock junk mail filtering settings	
-**  junk mail per account
-lock work week	
-lock first day of work week	
-lock working hours	
-disable forward as icalendar	
-lock color options for tasks	
-lock default contact filing format	
-* forbid signatures	Simple -- can be done with just a Gconf key and some UI work to make assoc. widgets unavailable
-* lock user to having 1 specific signature	Simple -- can be done with just a Gconf key and some UI work to make assoc. widgets unavailable
-* forbid adding/removing signatures	Simple -- can be done with just a Gconf key and some UI work to make assoc. widgets unavailable
-* lock each account to a certain signature	Relatively difficult -- involved redesign of the XML blobs which describe accounts 
-* set default folders	
-set trash emptying frequency	
-* lock displayed mail headers	Simple -- can be done with just a Gconf key and some UI work to make assoc. widgets unavailable
-* lock authentication type (for incoming mail)	Relatively difficult -- involves redesign of the XML blobs which describe accounts
-* lock authentication type (for outgoing mail)	Relatively difficult -- involves redesign of the XML blobs which describe accounts
-* lock minimum check mail on server frequency	Simple -- can be done with just a Gconf key and some UI work to make assoc. widgets unavailable
-** lock save password
-* require ssl always	Relatively difficult -- involves redesign of the XML blobs which describe accounts
-** lock imap subscribed folder option
-** lock filtering of inbox
-** lock source account/options
-** lock destination account/options
-*/
-
-static void e_account_finalize (GObject *);
-
-static void
-e_account_class_init (EAccountClass *klass)
-{
-	GObjectClass *object_class;
-	
-	/* virtual method override */
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = e_account_finalize;
-
-	signals[CHANGED] =
-		g_signal_new("changed",
-			     G_OBJECT_CLASS_TYPE (object_class),
-			     G_SIGNAL_RUN_LAST,
-			     G_STRUCT_OFFSET (EAccountClass, changed),
-			     NULL, NULL,
-			     g_cclosure_marshal_VOID__INT,
-			     G_TYPE_NONE, 1,
-			     G_TYPE_INT);
-}
-
-static void
-e_account_init (EAccount *account)
-{
-	account->id = g_new0 (EAccountIdentity, 1);
-	account->source = g_new0 (EAccountService, 1);
-	account->transport = g_new0 (EAccountService, 1);
-
-	account->parent_uid = NULL;
-	
-	account->source->auto_check = FALSE;
-	account->source->auto_check_time = 10;
-}
-
-static void
-identity_destroy (EAccountIdentity *id)
-{
-	if (!id)
-		return;
-
-	g_free (id->name);
-	g_free (id->address);
-	g_free (id->reply_to);
-	g_free (id->organization);
-	g_free (id->sig_uid);
-	
-	g_free (id);
-}
-
-static void
-service_destroy (EAccountService *service)
-{
-	if (!service)
-		return;
-
-	g_free (service->url);
-
-	g_free (service);
-}
-
-static void
-e_account_finalize (GObject *object)
-{
-	EAccount *account = E_ACCOUNT (object);
-
-	g_free (account->name);
-	g_free (account->uid);
-
-	identity_destroy (account->id);
-	service_destroy (account->source);
-	service_destroy (account->transport);
-	
-	g_free (account->drafts_folder_uri);
-	g_free (account->sent_folder_uri);
-
-	g_free (account->cc_addrs);
-	g_free (account->bcc_addrs);
-
-	g_free (account->pgp_key);
-	g_free (account->smime_sign_key);
-	g_free (account->smime_encrypt_key);
-
-	g_free (account->parent_uid);
-
-	G_OBJECT_CLASS (e_account_parent_class)->finalize (object);
-}
-
-/**
- * e_account_new:
- *
- * Return value: a blank new account which can be filled in and
- * added to an #EAccountList.
- **/
-EAccount *
-e_account_new (void)
-{
-	EAccount *account;
-
-	account = g_object_new (E_TYPE_ACCOUNT, NULL);
-	account->uid = e_uid_new ();
-
-	return account;
-}
-
-/**
- * e_account_new_from_xml:
- * @xml: an XML account description
- *
- * Return value: a new #EAccount based on the data in @xml, or %NULL
- * if @xml could not be parsed as valid account data.
- **/
-EAccount *
-e_account_new_from_xml (const char *xml)
-{
-	EAccount *account;
-
-	account = g_object_new (E_TYPE_ACCOUNT, NULL);
-	if (!e_account_set_from_xml (account, xml)) {
-		g_object_unref (account);
-		return NULL;
-	}
-
-	return account;
-}
-
-
-static gboolean
-xml_set_bool (xmlNodePtr node, const char *name, gboolean *val)
-{
-	gboolean bool;
-	char *buf;
-
-	if ((buf = xmlGetProp (node, name))) {
-		bool = (!strcmp (buf, "true") || !strcmp (buf, "yes"));
-		xmlFree (buf);
-
-		if (bool != *val) {
-			*val = bool;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-xml_set_int (xmlNodePtr node, const char *name, int *val)
-{
-	int number;
-	char *buf;
-
-	if ((buf = xmlGetProp (node, name))) {
-		number = strtol (buf, NULL, 10);
-		xmlFree (buf);
-
-		if (number != *val) {
-			*val = number;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-xml_set_prop (xmlNodePtr node, const char *name, char **val)
-{
-	char *buf;
-	int res;
-
-	buf = xmlGetProp(node, name);
-	if (buf == NULL) {
-		res = (*val != NULL);
-		if (res) {
-			g_free(*val);
-			*val = NULL;
-		}
-	} else {
-		res = *val == NULL || strcmp(*val, buf) != 0;
-		if (res) {
-			g_free(*val);
-			*val = g_strdup(buf);
-		}
-		xmlFree(buf);
-	}
-
-	return res;
-}
-
-static EAccountReceiptPolicy
-str_to_receipt_policy (const char *str)
-{
-	if (!strcmp (str, "ask"))
-		return E_ACCOUNT_RECEIPT_ASK;
-	if (!strcmp (str, "always"))
-		return E_ACCOUNT_RECEIPT_ALWAYS;
-
-	return E_ACCOUNT_RECEIPT_NEVER;
-}
-
-static char*
-receipt_policy_to_str (EAccountReceiptPolicy val)
-{
-	char *ret = 0;
-	
-	switch (val) {
-	case E_ACCOUNT_RECEIPT_NEVER:
-		ret = "never";
-		break;
-	case E_ACCOUNT_RECEIPT_ASK:
-		ret = "ask";
-		break;
-	case E_ACCOUNT_RECEIPT_ALWAYS:
-		ret = "always";
-		break;
-	}
-
-	return ret;
-}
-
-static gboolean
-xml_set_receipt_policy (xmlNodePtr node, const char *name, EAccountReceiptPolicy *val)
-{
-	EAccountReceiptPolicy new_val;
-	char *buf;
-
-	if ((buf = xmlGetProp (node, name))) {
-		new_val = str_to_receipt_policy (buf);
-		xmlFree (buf);
-
-		if (new_val != *val) {
-			*val = new_val;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-xml_set_content (xmlNodePtr node, char **val)
-{
-	char *buf;
-	int res;
-
-	buf = xmlNodeGetContent(node);
-	if (buf == NULL) {
-		res = (*val != NULL);
-		if (res) {
-			g_free(*val);
-			*val = NULL;
-		}
-	} else {
-		res = *val == NULL || strcmp(*val, buf) != 0;
-		if (res) {
-			g_free(*val);
-			*val = g_strdup(buf);
-		}
-		xmlFree(buf);
-	}
-
-	return res;
-}
-
-static gboolean
-xml_set_identity (xmlNodePtr node, EAccountIdentity *id)
-{
-	gboolean changed = FALSE;
-
-	for (node = node->children; node; node = node->next) {
-		if (!strcmp (node->name, "name"))
-			changed |= xml_set_content (node, &id->name);
-		else if (!strcmp (node->name, "addr-spec"))
-			changed |= xml_set_content (node, &id->address);
-		else if (!strcmp (node->name, "reply-to"))
-			changed |= xml_set_content (node, &id->reply_to);
-		else if (!strcmp (node->name, "organization"))
-			changed |= xml_set_content (node, &id->organization);
-		else if (!strcmp (node->name, "signature")) {
-			changed |= xml_set_prop (node, "uid", &id->sig_uid);
-			if (!id->sig_uid) {
-
-				/* WTF is this shit doing here?  Migrate is supposed to "handle this" */
-
-				/* set a fake sig uid so the migrate code can handle this */
-				gboolean autogen = FALSE;
-				int sig_id = 0;
-				
-				xml_set_bool (node, "auto", &autogen);
-				xml_set_int (node, "default", &sig_id);
-				
-				if (autogen) {
-					id->sig_uid = g_strdup ("::0");
-					changed = TRUE;
-				} else if (sig_id) {
-					id->sig_uid = g_strdup_printf ("::%d", sig_id + 1);
-					changed = TRUE;
-				}
-			}
-		}
-	}
-
-	return changed;
-}
-
-static gboolean
-xml_set_service (xmlNodePtr node, EAccountService *service)
-{
-	gboolean changed = FALSE;
-
-	changed |= xml_set_bool (node, "save-passwd", &service->save_passwd);
-	changed |= xml_set_bool (node, "keep-on-server", &service->keep_on_server);
-
-	changed |= xml_set_bool (node, "auto-check", &service->auto_check);
-	changed |= xml_set_int (node, "auto-check-timeout", &service->auto_check_time);
-	if (service->auto_check && service->auto_check_time <= 0) {
-		service->auto_check = FALSE;
-		service->auto_check_time = 0;
-	}
-
-	for (node = node->children; node; node = node->next) {
-		if (!strcmp (node->name, "url")) {
-			changed |= xml_set_content (node, &service->url);
-			break;
-		}
-	}
-
-	return changed;
-}
-
-/**
- * e_account_set_from_xml:
- * @account: an #EAccount
- * @xml: an XML account description.
- *
- * Changes @account to match @xml.
- *
- * Return value: %TRUE if @account was changed, %FALSE if @account
- * already matched @xml or @xml could not be parsed
- **/
-gboolean
-e_account_set_from_xml (EAccount *account, const char *xml)
-{
-	xmlNodePtr node, cur;
-	xmlDocPtr doc;
-	gboolean changed = FALSE;
-
-	if (!(doc = xmlParseDoc ((char *)xml)))
-		return FALSE;
-
-	node = doc->children;
-	if (strcmp (node->name, "account") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	if (!account->uid)
-		xml_set_prop (node, "uid", &account->uid);
-	
-	changed |= xml_set_prop (node, "name", &account->name);
-	changed |= xml_set_bool (node, "enabled", &account->enabled);
-	
-	for (node = node->children; node; node = node->next) {
-		if (!strcmp (node->name, "identity")) {
-			changed |= xml_set_identity (node, account->id);
-		} else if (!strcmp (node->name, "source")) {
-			changed |= xml_set_service (node, account->source);
-		} else if (!strcmp (node->name, "transport")) {
-			changed |= xml_set_service (node, account->transport);
-		} else if (!strcmp (node->name, "drafts-folder")) {
-			changed |= xml_set_content (node, &account->drafts_folder_uri);
-		} else if (!strcmp (node->name, "sent-folder")) {
-			changed |= xml_set_content (node, &account->sent_folder_uri);
-		} else if (!strcmp (node->name, "auto-cc")) {
-			changed |= xml_set_bool (node, "always", &account->always_cc);
-			changed |= xml_set_content (node, &account->cc_addrs);
-		} else if (!strcmp (node->name, "auto-bcc")) {
-			changed |= xml_set_bool (node, "always", &account->always_bcc);
-			changed |= xml_set_content (node, &account->bcc_addrs);
-		} else if (!strcmp (node->name, "receipt-policy")) {
-			changed |= xml_set_receipt_policy (node, "policy", &account->receipt_policy);
-		} else if (!strcmp (node->name, "pgp")) {
-			changed |= xml_set_bool (node, "encrypt-to-self", &account->pgp_encrypt_to_self);
-			changed |= xml_set_bool (node, "always-trust", &account->pgp_always_trust);
-			changed |= xml_set_bool (node, "always-sign", &account->pgp_always_sign);
-			changed |= xml_set_bool (node, "no-imip-sign", &account->pgp_no_imip_sign);
-
-			if (node->children) {
-				for (cur = node->children; cur; cur = cur->next) {
-					if (!strcmp (cur->name, "key-id")) {
-						changed |= xml_set_content (cur, &account->pgp_key);
-						break;
-					}
-				}
-			}
-		} else if (!strcmp (node->name, "smime")) {
-			changed |= xml_set_bool (node, "sign-default", &account->smime_sign_default);
-			changed |= xml_set_bool (node, "encrypt-to-self", &account->smime_encrypt_to_self);
-			changed |= xml_set_bool (node, "encrypt-default", &account->smime_encrypt_default);
-
-			if (node->children) {
-				for (cur = node->children; cur; cur = cur->next) {
-					if (!strcmp (cur->name, "sign-key-id")) {
-						changed |= xml_set_content (cur, &account->smime_sign_key);
-					} else if (!strcmp (cur->name, "encrypt-key-id")) {
-						changed |= xml_set_content (cur, &account->smime_encrypt_key);
-						break;
-					}
-				}
-			}
-		} else if (!strcmp (node->name, "proxy")) {
-			if (node->children) {
-				for (cur = node->children; cur; cur = cur->next) {
-					if (!strcmp (cur->name, "parent-uid")) {
-						changed |= xml_set_content (cur, &account->parent_uid);
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	xmlFreeDoc (doc);
-
-	g_signal_emit(account, signals[CHANGED], 0, -1);
-
-	return changed;
-}
-
-/**
- * e_account_import:
- * @dest: destination account object
- * @src: source account object
- *
- * Import the settings from @src to @dest.
- **/
-void
-e_account_import (EAccount *dest, EAccount *src)
-{
-	g_free (dest->name);
-	dest->name = g_strdup (src->name);
-	
-	dest->enabled = src->enabled;
-	
-	g_free (dest->id->name);
-	dest->id->name = g_strdup (src->id->name);
-	g_free (dest->id->address);
-	dest->id->address = g_strdup (src->id->address);
-	g_free (dest->id->reply_to);
-	dest->id->reply_to = g_strdup (src->id->reply_to);
-	g_free (dest->id->organization);
-	dest->id->organization = g_strdup (src->id->organization);
-	dest->id->sig_uid = g_strdup (src->id->sig_uid);
-	
-	g_free (dest->source->url);
-	dest->source->url = g_strdup (src->source->url);
-	dest->source->keep_on_server = src->source->keep_on_server;
-	dest->source->auto_check = src->source->auto_check;
-	dest->source->auto_check_time = src->source->auto_check_time;
-	dest->source->save_passwd = src->source->save_passwd;
-	
-	g_free (dest->transport->url);
-	dest->transport->url = g_strdup (src->transport->url);
-	dest->transport->save_passwd = src->transport->save_passwd;
-	
-	g_free (dest->drafts_folder_uri);
-	dest->drafts_folder_uri = g_strdup (src->drafts_folder_uri);
-	
-	g_free (dest->sent_folder_uri);
-	dest->sent_folder_uri = g_strdup (src->sent_folder_uri);
-	
-	dest->always_cc = src->always_cc;
-	g_free (dest->cc_addrs);
-	dest->cc_addrs = g_strdup (src->cc_addrs);
-	
-	dest->always_bcc = src->always_bcc;
-	g_free (dest->bcc_addrs);
-	dest->bcc_addrs = g_strdup (src->bcc_addrs);
-	
-	dest->receipt_policy = src->receipt_policy;
-	
-	g_free (dest->pgp_key);
-	dest->pgp_key = g_strdup (src->pgp_key);
-	dest->pgp_encrypt_to_self = src->pgp_encrypt_to_self;
-	dest->pgp_always_sign = src->pgp_always_sign;
-	dest->pgp_no_imip_sign = src->pgp_no_imip_sign;
-	dest->pgp_always_trust = src->pgp_always_trust;
-	
-	dest->smime_sign_default = src->smime_sign_default;
-	g_free (dest->smime_sign_key);
-	dest->smime_sign_key = g_strdup (src->smime_sign_key);
-
-	dest->smime_encrypt_default = src->smime_encrypt_default;
-	dest->smime_encrypt_to_self = src->smime_encrypt_to_self;
-	g_free (dest->smime_encrypt_key);
-	dest->smime_encrypt_key = g_strdup (src->smime_encrypt_key);
-	
-	g_signal_emit(dest, signals[CHANGED], 0, -1);
-}
-
-/**
- * e_account_to_xml:
- * @account: an #EAccount
- *
- * Return value: an XML representation of @account, which the caller
- * must free.
- **/
-char *
-e_account_to_xml (EAccount *account)
-{
-	xmlNodePtr root, node, id, src, xport;
-	char *tmp, buf[20];
-	xmlChar *xmlbuf;
-	xmlDocPtr doc;
-	int n;
-
-	doc = xmlNewDoc ("1.0");
-
-	root = xmlNewDocNode (doc, NULL, "account", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	xmlSetProp (root, "name", account->name);
-	xmlSetProp (root, "uid", account->uid);
-	xmlSetProp (root, "enabled", account->enabled ? "true" : "false");
-
-	id = xmlNewChild (root, NULL, "identity", NULL);
-	if (account->id->name)
-		xmlNewTextChild (id, NULL, "name", account->id->name);
-	if (account->id->address)
-		xmlNewTextChild (id, NULL, "addr-spec", account->id->address);
-	if (account->id->reply_to)
-		xmlNewTextChild (id, NULL, "reply-to", account->id->reply_to);
-	if (account->id->organization)
-		xmlNewTextChild (id, NULL, "organization", account->id->organization);
-	
-	node = xmlNewChild (id, NULL, "signature",NULL);
-	xmlSetProp (node, "uid", account->id->sig_uid);
-	
-	src = xmlNewChild (root, NULL, "source", NULL);
-	xmlSetProp (src, "save-passwd", account->source->save_passwd ? "true" : "false");
-	xmlSetProp (src, "keep-on-server", account->source->keep_on_server ? "true" : "false");
-	xmlSetProp (src, "auto-check", account->source->auto_check ? "true" : "false");
-	sprintf (buf, "%d", account->source->auto_check_time);
-	xmlSetProp (src, "auto-check-timeout", buf);
-	if (account->source->url)
-		xmlNewTextChild (src, NULL, "url", account->source->url);
-
-	xport = xmlNewChild (root, NULL, "transport", NULL);
-	xmlSetProp (xport, "save-passwd", account->transport->save_passwd ? "true" : "false");
-	if (account->transport->url)
-		xmlNewTextChild (xport, NULL, "url", account->transport->url);
-
-	xmlNewTextChild (root, NULL, "drafts-folder", account->drafts_folder_uri);
-	xmlNewTextChild (root, NULL, "sent-folder", account->sent_folder_uri);
-
-	node = xmlNewChild (root, NULL, "auto-cc", NULL);
-	xmlSetProp (node, "always", account->always_cc ? "true" : "false");
-	if (account->cc_addrs)
-		xmlNewTextChild (node, NULL, "recipients", account->cc_addrs);
-
-	node = xmlNewChild (root, NULL, "auto-bcc", NULL);
-	xmlSetProp (node, "always", account->always_bcc ? "true" : "false");
-	if (account->bcc_addrs)
-		xmlNewTextChild (node, NULL, "recipients", account->bcc_addrs);
-
-	node = xmlNewChild (root, NULL, "receipt-policy", NULL);
-	xmlSetProp (node, "policy", receipt_policy_to_str (account->receipt_policy));
-	
-	node = xmlNewChild (root, NULL, "pgp", NULL);
-	xmlSetProp (node, "encrypt-to-self", account->pgp_encrypt_to_self ? "true" : "false");
-	xmlSetProp (node, "always-trust", account->pgp_always_trust ? "true" : "false");
-	xmlSetProp (node, "always-sign", account->pgp_always_sign ? "true" : "false");
-	xmlSetProp (node, "no-imip-sign", account->pgp_no_imip_sign ? "true" : "false");
-	if (account->pgp_key)
-		xmlNewTextChild (node, NULL, "key-id", account->pgp_key);
-
-	node = xmlNewChild (root, NULL, "smime", NULL);
-	xmlSetProp (node, "sign-default", account->smime_sign_default ? "true" : "false");
-	xmlSetProp (node, "encrypt-default", account->smime_encrypt_default ? "true" : "false");
-	xmlSetProp (node, "encrypt-to-self", account->smime_encrypt_to_self ? "true" : "false");
-	if (account->smime_sign_key)
-		xmlNewTextChild (node, NULL, "sign-key-id", account->smime_sign_key);
-	if (account->smime_encrypt_key)
-		xmlNewTextChild (node, NULL, "encrypt-key-id", account->smime_encrypt_key);
-
-	if (account->parent_uid) {
-		node = xmlNewChild (root, NULL, "proxy", NULL);
-		xmlNewTextChild (node, NULL, "parent-uid", account->parent_uid);
-	}	
-
-	xmlDocDumpMemory (doc, &xmlbuf, &n);
-	xmlFreeDoc (doc);
-
-	/* remap to glib memory */
-	tmp = g_malloc (n + 1);
-	memcpy (tmp, xmlbuf, n);
-	tmp[n] = '\0';
-	xmlFree (xmlbuf);
-
-	return tmp;
-}
-
-/**
- * e_account_uid_from_xml:
- * @xml: an XML account description
- *
- * Return value: the permanent UID of the account described by @xml
- * (or %NULL if @xml could not be parsed or did not contain a uid).
- * The caller must free this string.
- **/
-char *
-e_account_uid_from_xml (const char *xml)
-{
-	xmlNodePtr node;
-	xmlDocPtr doc;
-	char *uid = NULL;
-
-	if (!(doc = xmlParseDoc ((char *)xml)))
-		return NULL;
-
-	node = doc->children;
-	if (strcmp (node->name, "account") != 0) {
-		xmlFreeDoc (doc);
-		return NULL;
-	}
-
-	xml_set_prop (node, "uid", &uid);
-	xmlFreeDoc (doc);
-
-	return uid;
-}
-
-enum {
-	EAP_IMAP_SUBSCRIBED = 0,
-	EAP_IMAP_NAMESPACE,
-	EAP_FILTER_INBOX,
-	EAP_FILTER_JUNK,
-	EAP_FORCE_SSL,
-	EAP_LOCK_SIGNATURE,
-	EAP_LOCK_AUTH,
-	EAP_LOCK_AUTOCHECK,
-	EAP_LOCK_DEFAULT_FOLDERS,
-	EAP_LOCK_SAVE_PASSWD,
-	EAP_LOCK_SOURCE,
-	EAP_LOCK_TRANSPORT,
-};
-
-static struct _system_info {
-	const char *key;
-	guint32 perm;
-} system_perms[] = {
-	{ "imap_subscribed", 1<<EAP_IMAP_SUBSCRIBED },
-	{ "imap_namespace", 1<<EAP_IMAP_NAMESPACE },
-	{ "filter_inbox", 1<<EAP_FILTER_INBOX },
-	{ "filter_junk", 1<<EAP_FILTER_JUNK },
-	{ "ssl", 1<<EAP_FORCE_SSL },
-	{ "signature", 1<<EAP_LOCK_SIGNATURE },
-	{ "authtype", 1<<EAP_LOCK_AUTH },
-	{ "autocheck", 1<<EAP_LOCK_AUTOCHECK },
-	{ "default_folders", 1<<EAP_LOCK_DEFAULT_FOLDERS },
-	{ "save_passwd" , 1<<EAP_LOCK_SAVE_PASSWD },
-	{ "source", 1<<EAP_LOCK_SOURCE },
-	{ "transport", 1<<EAP_LOCK_TRANSPORT },
-};
-
-#define TYPE_STRING (1)
-#define TYPE_INT (2)
-#define TYPE_BOOL (3)
-#define TYPE_MASK (0xff)
-#define TYPE_STRUCT (1<<8)
-
-static struct _account_info {
-	guint32 perms;
-	guint32 type;
-	unsigned int offset;
-	unsigned int struct_offset;
-} account_info[E_ACCOUNT_ITEM_LAST] = {
-	{ /* E_ACCOUNT_NAME */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, name) },
-
-	{ /* E_ACCOUNT_ID_NAME, */ 0, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, id), G_STRUCT_OFFSET(EAccountIdentity, name) },
-	{ /* E_ACCOUNT_ID_ADDRESS, */ 0, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, id), G_STRUCT_OFFSET(EAccountIdentity, address) },
-	{ /* E_ACCOUNT_ID_REPLY_TO, */ 0, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, id), G_STRUCT_OFFSET(EAccountIdentity, reply_to) },
-	{ /* E_ACCOUNT_ID_ORGANIZATION */ 0, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, id), G_STRUCT_OFFSET(EAccountIdentity, organization) },
-	{ /* E_ACCOUNT_ID_SIGNATURE */ 1<<EAP_LOCK_SIGNATURE, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, id), G_STRUCT_OFFSET(EAccountIdentity, sig_uid) },
-
-	{ /* E_ACCOUNT_SOURCE_URL */ 1<<EAP_LOCK_SOURCE, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, source), G_STRUCT_OFFSET(EAccountService, url) },
-	{ /* E_ACCOUNT_SOURCE_KEEP_ON_SERVER */ 0, TYPE_BOOL|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, source), G_STRUCT_OFFSET(EAccountService, keep_on_server) },
-	{ /* E_ACCOUNT_SOURCE_AUTO_CHECK */ 1<<EAP_LOCK_AUTOCHECK, TYPE_BOOL|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, source), G_STRUCT_OFFSET(EAccountService, auto_check) },
-	{ /* E_ACCOUNT_SOURCE_AUTO_CHECK_TIME */ 1<<EAP_LOCK_AUTOCHECK, TYPE_INT|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, source), G_STRUCT_OFFSET(EAccountService, auto_check_time) },
-	{ /* E_ACCOUNT_SOURCE_SAVE_PASSWD */ 1<<EAP_LOCK_SAVE_PASSWD, TYPE_BOOL|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, source), G_STRUCT_OFFSET(EAccountService, save_passwd) },
-
-	{ /* E_ACCOUNT_TRANSPORT_URL */ 1<<EAP_LOCK_TRANSPORT, TYPE_STRING|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, transport), G_STRUCT_OFFSET(EAccountService, url) },
-	{ /* E_ACCOUNT_TRANSPORT_SAVE_PASSWD */ 1<<EAP_LOCK_SAVE_PASSWD, TYPE_BOOL|TYPE_STRUCT, G_STRUCT_OFFSET(EAccount, transport), G_STRUCT_OFFSET(EAccountService, save_passwd) },
-
-	{ /* E_ACCOUNT_DRAFTS_FOLDER_URI */ 1<<EAP_LOCK_DEFAULT_FOLDERS, TYPE_STRING, G_STRUCT_OFFSET(EAccount, drafts_folder_uri) },
-	{ /* E_ACCOUNT_SENT_FOLDER_URI */ 1<<EAP_LOCK_DEFAULT_FOLDERS, TYPE_STRING, G_STRUCT_OFFSET(EAccount, sent_folder_uri) },
-
-	{ /* E_ACCOUNT_CC_ALWAYS */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, always_cc) },
-	{ /* E_ACCOUNT_CC_ADDRS */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, cc_addrs) },
-
-	{ /* E_ACCOUNT_BCC_ALWAYS */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, always_bcc) },
-	{ /* E_ACCOUNT_BCC_ADDRS */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, bcc_addrs) },
-
-	{ /* E_ACCOUNT_RECEIPT_POLICY */ 0, TYPE_INT, G_STRUCT_OFFSET(EAccount, receipt_policy) },
-	
-	{ /* E_ACCOUNT_PGP_KEY */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, pgp_key) },
-	{ /* E_ACCOUNT_PGP_ENCRYPT_TO_SELF */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, pgp_encrypt_to_self) },
-	{ /* E_ACCOUNT_PGP_ALWAYS_SIGN */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, pgp_always_sign) },
-	{ /* E_ACCOUNT_PGP_NO_IMIP_SIGN */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, pgp_no_imip_sign) },
-	{ /* E_ACCOUNT_PGP_ALWAYS_TRUST */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, pgp_always_trust) },
-
-	{ /* E_ACCOUNT_SMIME_SIGN_KEY */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, smime_sign_key) },
-	{ /* E_ACCOUNT_SMIME_ENCRYPT_KEY */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, smime_encrypt_key) },
-	{ /* E_ACCOUNT_SMIME_SIGN_DEFAULT */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, smime_sign_default) },
-	{ /* E_ACCOUNT_SMIME_ENCRYPT_TO_SELF */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, smime_encrypt_to_self) },
-	{ /* E_ACCOUNT_SMIME_ENCRYPT_DEFAULT */ 0, TYPE_BOOL, G_STRUCT_OFFSET(EAccount, smime_encrypt_default) },
-
-	{ /* E_ACCOUNT_PROXY_PARENT_UID, */ 0, TYPE_STRING, G_STRUCT_OFFSET(EAccount, parent_uid) },
-};
-
-static GHashTable *ea_option_table;
-static GHashTable *ea_system_table;
-static guint32 ea_perms;
-
-static struct _option_info {
-	char *key;
-	guint32 perms;
-} ea_option_list[] = {
-	{ "imap_use_lsub", 1<<EAP_IMAP_SUBSCRIBED },
-	{ "imap_override_namespace", 1<<EAP_IMAP_NAMESPACE },
-	{ "imap_filter", 1<<EAP_FILTER_INBOX },
-	{ "imap_filter_junk", 1<<EAP_FILTER_JUNK },
-	{ "imap_filter_junk_inbox", 1<<EAP_FILTER_JUNK },
-	{ "*_use_ssl", 1<<EAP_FORCE_SSL },
-	{ "*_auth", 1<<EAP_LOCK_AUTH },
-};
-
-#define LOCK_BASE "/apps/evolution/lock/mail/accounts"
-
-static void
-ea_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, void *crap)
-{
-	GConfValue *value;
-	char *tkey;
-	struct _system_info *info;
-
-	g_return_if_fail (gconf_entry_get_key (entry) != NULL);
-	
-	if (!(value = gconf_entry_get_value (entry)))
-		return;
-	
-	tkey = strrchr(entry->key, '/');
-	g_return_if_fail (tkey != NULL);
-
-	info = g_hash_table_lookup(ea_system_table, tkey+1);
-	if (info) {
-		if (gconf_value_get_bool(value))
-			ea_perms |= info->perm;
-		else
-			ea_perms &= ~info->perm;
-	}
-}
-
-static void
-ea_setting_setup(void)
-{
-	GConfClient *gconf = gconf_client_get_default();
-	GConfEntry *entry;
-	GError *err = NULL;
-	int i;
-	char key[64];
-
-	if (ea_option_table != NULL)
-		return;
-
-	ea_option_table = g_hash_table_new(g_str_hash, g_str_equal);
-	for (i=0;i<sizeof(ea_option_list)/sizeof(ea_option_list[0]);i++)
-		g_hash_table_insert(ea_option_table, ea_option_list[i].key, &ea_option_list[i]);
-
-	gconf_client_add_dir(gconf, LOCK_BASE, GCONF_CLIENT_PRELOAD_NONE, NULL);
-
-	ea_system_table = g_hash_table_new(g_str_hash, g_str_equal);
-	for (i=0;i<sizeof(system_perms)/sizeof(system_perms[0]);i++) {
-		g_hash_table_insert(ea_system_table, (char *)system_perms[i].key, &system_perms[i]);
-		sprintf(key, LOCK_BASE "/%s", system_perms[i].key);
-		entry = gconf_client_get_entry(gconf, key, NULL, TRUE, &err);
-		if (entry)
-			ea_setting_notify(gconf, 0, entry, NULL);
-		gconf_entry_free(entry);
-	}
-
-	if (err) {
-		g_warning("Could not load account lock settings: %s", err->message);
-		g_error_free(err);
-	}
-
-	gconf_client_notify_add(gconf, LOCK_BASE, (GConfClientNotifyFunc)ea_setting_notify, NULL, NULL, NULL);
-	g_object_unref(gconf);
-}
-
-/* look up the item in the structure or the substructure using our table of reflection data */
-#define addr(ea, type) \
-	((account_info[type].type & TYPE_STRUCT)? \
-	(((char **)(((char *)ea)+account_info[type].offset))[0] + account_info[type].struct_offset): \
-	(((char *)ea)+account_info[type].offset))
-	
-const char *e_account_get_string(EAccount *ea, e_account_item_t type)
-{
-	return *((const char **)addr(ea, type));
-}
-
-int e_account_get_int(EAccount *ea, e_account_item_t type)
-{
-	return *((int *)addr(ea, type));
-}
-
-gboolean e_account_get_bool(EAccount *ea, e_account_item_t type)
-{
-	return *((gboolean *)addr(ea, type));
-}
-
-#if d(!)0
-static void
-dump_account(EAccount *ea)
-{
-	char *xml;
-
-	printf("Account changed\n");
-	xml = e_account_to_xml(ea);
-	printf(" ->\n%s\n", xml);
-	g_free(xml);
-}
-#endif
-
-/* TODO: should it return true if it changed? */
-void e_account_set_string(EAccount *ea, e_account_item_t type, const char *val)
-{
-	char **p;
-
-	if (!e_account_writable(ea, type)) {
-		g_warning("Trying to set non-writable option account value");
-	} else {
-		p = (char **)addr(ea, type);
-		d(printf("Setting string %d: old '%s' new '%s'\n", type, *p, val));
-		if (*p != val
-		    && (*p == NULL || val == NULL || strcmp(*p, val) != 0)) {
-			g_free(*p);
-			*p = g_strdup(val);
-			d(dump_account(ea));
-			g_signal_emit(ea, signals[CHANGED], 0, type);
-		}
-	}
-}
-
-void e_account_set_int(EAccount *ea, e_account_item_t type, int val)
-{
-	if (!e_account_writable(ea, type)) {
-		g_warning("Trying to set non-writable option account value");
-	} else {
-		int *p = (int *)addr(ea, type);
-
-		if (*p != val) {
-			*p = val;
-			d(dump_account(ea));
-			g_signal_emit(ea, signals[CHANGED], 0, type);
-		}
-	}
-}
-
-void e_account_set_bool(EAccount *ea, e_account_item_t type, gboolean val)
-{
-	if (!e_account_writable(ea, type)) {
-		g_warning("Trying to set non-writable option account value");
-	} else {
-		gboolean *p = (gboolean *)addr(ea, type);
-
-		if (*p != val) {
-			*p = val;
-			d(dump_account(ea));
-			g_signal_emit(ea, signals[CHANGED], 0, type);
-		}
-	}
-}
-
-gboolean
-e_account_writable_option(EAccount *ea, const char *protocol, const char *option)
-{
-	char *key;
-	struct _option_info *info;
-
-	ea_setting_setup();
-
-	key = alloca(strlen(protocol)+strlen(option)+2);
-	sprintf(key, "%s_%s", protocol, option);
-
-	info = g_hash_table_lookup(ea_option_table, key);
-	if (info == NULL) {
-		sprintf(key, "*_%s", option);
-		info = g_hash_table_lookup(ea_option_table, key);
-	}
-
-	d(printf("checking writable option '%s' perms=%08x\n", option, info?info->perms:0));
-
-	return info == NULL
-		|| (info->perms & ea_perms) == 0;
-}
-
-gboolean
-e_account_writable(EAccount *ea, e_account_item_t type)
-{
-	ea_setting_setup();
-
-	return (account_info[type].perms & ea_perms) == 0;
-}
diff --git a/e-util/e-account.h b/e-util/e-account.h
deleted file mode 100644
index 2969ecef63..0000000000
--- a/e-util/e-account.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_ACCOUNT__
-#define __E_ACCOUNT__
-
-#include <glib-object.h>
-
-#define E_TYPE_ACCOUNT            (e_account_get_type ())
-#define E_ACCOUNT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ACCOUNT, EAccount))
-#define E_ACCOUNT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ACCOUNT, EAccountClass))
-#define E_IS_ACCOUNT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ACCOUNT))
-#define E_IS_ACCOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ACCOUNT))
-
-typedef enum _e_account_item_t {
-	E_ACCOUNT_NAME,
-
-	E_ACCOUNT_ID_NAME,
-	E_ACCOUNT_ID_ADDRESS,
-	E_ACCOUNT_ID_REPLY_TO,
-	E_ACCOUNT_ID_ORGANIZATION,
-	E_ACCOUNT_ID_SIGNATURE,
-
-	E_ACCOUNT_SOURCE_URL,	/* what about separating out host/user/path settings??  sigh */
-	E_ACCOUNT_SOURCE_KEEP_ON_SERVER,
-	E_ACCOUNT_SOURCE_AUTO_CHECK,
-	E_ACCOUNT_SOURCE_AUTO_CHECK_TIME,
-	E_ACCOUNT_SOURCE_SAVE_PASSWD,
-
-	E_ACCOUNT_TRANSPORT_URL,
-	E_ACCOUNT_TRANSPORT_SAVE_PASSWD,
-
-	E_ACCOUNT_DRAFTS_FOLDER_URI,
-	E_ACCOUNT_SENT_FOLDER_URI,
-
-	E_ACCOUNT_CC_ALWAYS,
-	E_ACCOUNT_CC_ADDRS,
-
-	E_ACCOUNT_BCC_ALWAYS,
-	E_ACCOUNT_BCC_ADDRS,
-
-	E_ACCOUNT_RECEIPT_POLICY,
-	
-	E_ACCOUNT_PGP_KEY,
-	E_ACCOUNT_PGP_ENCRYPT_TO_SELF,
-	E_ACCOUNT_PGP_ALWAYS_SIGN,
-	E_ACCOUNT_PGP_NO_IMIP_SIGN,
-	E_ACCOUNT_PGP_ALWAYS_TRUST,
-
-	E_ACCOUNT_SMIME_SIGN_KEY,
-	E_ACCOUNT_SMIME_ENCRYPT_KEY,
-	E_ACCOUNT_SMIME_SIGN_DEFAULT,
-	E_ACCOUNT_SMIME_ENCRYPT_TO_SELF,
-	E_ACCOUNT_SMIME_ENCRYPT_DEFAULT,
-
-	E_ACCOUNT_PROXY_PARENT_UID,
-
-	E_ACCOUNT_ITEM_LAST
-} e_account_item_t;
-
-typedef enum _e_account_access_t {
-	E_ACCOUNT_ACCESS_WRITE = 1<<0,
-} e_account_access_t;
-
-typedef struct _EAccountIdentity {
-	char *name;
-	char *address;
-	char *reply_to;
-	char *organization;
-	char *sig_uid;
-} EAccountIdentity;
-
-typedef enum _EAccountReceiptPolicy {
-	E_ACCOUNT_RECEIPT_NEVER,
-	E_ACCOUNT_RECEIPT_ASK,
-	E_ACCOUNT_RECEIPT_ALWAYS
-} EAccountReceiptPolicy;
-
-typedef struct _EAccountService {
-	char *url;
-	gboolean keep_on_server;
-	gboolean auto_check;
-	int auto_check_time;
-	gboolean save_passwd;
-} EAccountService;
-
-typedef struct _EAccount {
-	GObject parent_object;
-
-	char *name;
-	char *uid;
-
-	gboolean enabled;
-
-	EAccountIdentity *id;
-	EAccountService *source;
-	EAccountService *transport;
-
-	char *drafts_folder_uri, *sent_folder_uri;
-
-	gboolean always_cc;
-	char *cc_addrs;
-	gboolean always_bcc;
-	char *bcc_addrs;
-
-	EAccountReceiptPolicy receipt_policy;
-
-	char *pgp_key;
-	gboolean pgp_encrypt_to_self;
-	gboolean pgp_always_sign;
-	gboolean pgp_no_imip_sign;
-	gboolean pgp_always_trust;
-
-	char *parent_uid;
-
-	char *smime_sign_key;
-	char *smime_encrypt_key;
-	gboolean smime_sign_default;
-	gboolean smime_encrypt_to_self;
-	gboolean smime_encrypt_default;
-} EAccount;
-
-typedef struct {
-	GObjectClass parent_class;
-
-	void (*changed)(EAccount *, int field);
-} EAccountClass;
-
-
-GType     e_account_get_type (void);
-
-EAccount *e_account_new          (void);
-
-EAccount *e_account_new_from_xml (const char *xml);
-gboolean  e_account_set_from_xml (EAccount   *account, const char *xml);
-void      e_account_import       (EAccount   *dest, EAccount   *src);
-char     *e_account_to_xml       (EAccount   *account);
-char     *e_account_uid_from_xml (const char *xml);
-
-const char *e_account_get_string(EAccount *, e_account_item_t type);
-int e_account_get_int(EAccount *, e_account_item_t type);
-gboolean e_account_get_bool(EAccount *, e_account_item_t type);
-
-void e_account_set_string(EAccount *, e_account_item_t type, const char *);
-void e_account_set_int(EAccount *, e_account_item_t type, int);
-void e_account_set_bool(EAccount *, e_account_item_t type, gboolean);
-
-gboolean e_account_writable(EAccount *ea, e_account_item_t type);
-gboolean e_account_writable_option(EAccount *ea, const char *protocol, const char *option);
-
-#endif /* __E_ACCOUNT__ */