[evolution-patches] Possible fix for removal of duplicated files in evolution/e-util

["Simon.Zheng" <Simon Zheng Sun COM>]

Hi guys,

Here is the bug descritption
http://bugzilla.gnome.org/show_bug.cgi?id=323529
http://live.gnome.org/EvolutionEUtilDieDieDie

Previously,  identical files in evolution/e-util have been removed. But 
there're some other trivial files that have been developed further. Even 
though this kind of files have the same names in evolution/e-util and 
evolution-data-server/libedataserver, but their codes are different. I 
think we should carefully deal with these files as follows .

e-account.h
e-account.c
e-account-list.h
e-account-list.c
e-util.h
e-util.c

1. Possible fix for e-account.h, e-account.c e-account-list.h 
e-account-list.c.
As the copies in evolution/e-util have been developed further, merge 
these changes into the copy in libedataserver and drop the copies in 
e-util. Attached the patches for current head.

2. Possible fix for e-util.h and e-util.c
These two files are very different between evolution/e-util and 
evolution-data-server/libedataserver. Thus, I think merging isn't a good 
idea. Instead of merging, we can rename them in 
evolution-data-server/libedataserver, like e-data-server-util.h, 
e-data-server-util.c. Attached the patches for current head.

Thanks,
-Simon

? evolution-data-server/libedataserver/a.diff
Index: evolution-data-server/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.350
diff -u -p -r1.350 ChangeLog
--- evolution-data-server/ChangeLog	13 Dec 2005 14:07:16 -0000	1.350
+++ evolution-data-server/ChangeLog	16 Dec 2005 12:01:31 -0000
@@ -1,3 +1,21 @@
+2005-12-15  Simon Zheng  <Simon Zheng sun com>
+
+	* libedataserver/e-account-list.c: Since e-util/e-account-list.c 
+	in evolution module has been developed further. Merge those 
+	changes into libedataserver, and drop e-util/e-account-list.c.
+
+	libedataserver/e-account-list.h: Since e-util/e-account-list.h in
+	evolution module has been developed further. Merge those changes 
+	into libedataserver, and drop e-util/e-account-list.h.
+
+	libedataserver/e-account.c: Since e-util/e-account.c in
+	evolution module has been developed further. Merge those changes 
+	into libedataserver, and drop e-util/e-account.c.
+
+	libedataserver/e-account.h: Since e-util/e-account.h in
+	evolution module has been developed further. Merge those changes 
+	into libedataserver, and drop e-util/e-account.h.
+
 2005-12-13  Tor Lillqvist  <tml novell com>
 
 	* libedataserver/e-uid.c (e_uid_new): Use g_get_host_name() when
Index: evolution-data-server/libedataserver/e-account-list.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-account-list.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-account-list.c
--- evolution-data-server/libedataserver/e-account-list.c	17 Nov 2005 11:38:47 -0000	1.4
+++ evolution-data-server/libedataserver/e-account-list.c	16 Dec 2005 12:01:35 -0000
@@ -292,6 +292,46 @@ e_account_list_save (EAccountList *accou
 	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: 
@@ -450,6 +490,10 @@ e_account_list_find(EAccountList *accoun
 		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;
 		}
 
Index: evolution-data-server/libedataserver/e-account-list.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-account-list.h,v
retrieving revision 1.3
diff -u -p -r1.3 e-account-list.h
--- evolution-data-server/libedataserver/e-account-list.h	31 Aug 2005 04:26:10 -0000	1.3
+++ evolution-data-server/libedataserver/e-account-list.h	16 Dec 2005 12:01:35 -0000
@@ -40,9 +40,10 @@ typedef enum _e_account_find_t {
 	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 {
+typedef struct _EAccountList {
 	EList parent_object;
 
 	EAccountListPrivate *priv;
@@ -73,6 +74,10 @@ void            e_account_list_remove   
 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 *);
 
 G_END_DECLS
 
Index: evolution-data-server/libedataserver/e-account.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-account.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-account.c
--- evolution-data-server/libedataserver/e-account.c	17 Nov 2005 11:38:47 -0000	1.4
+++ evolution-data-server/libedataserver/e-account.c	16 Dec 2005 12:01:35 -0000
@@ -31,10 +31,56 @@
 #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];
+
 static void finalize (GObject *);
 
 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_class_init (EAccountClass *account_class)
 {
@@ -42,6 +88,16 @@ e_account_class_init (EAccountClass *acc
 
 	/* virtual method override */
 	object_class->finalize = 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
@@ -50,6 +106,11 @@ 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
@@ -62,6 +123,7 @@ identity_destroy (EAccountIdentity *id)
 	g_free (id->address);
 	g_free (id->reply_to);
 	g_free (id->organization);
+	g_free (id->sig_uid);
 
 	g_free (id);
 }
@@ -99,6 +161,8 @@ finalize (GObject *object)
 	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);
 }
 
@@ -182,45 +246,101 @@ xml_set_int (xmlNodePtr node, const char
 static gboolean
 xml_set_prop (xmlNodePtr node, const char *name, char **val)
 {
-	char *buf, *new_val;
+	char *buf;
+	int res;
 
 	buf = xmlGetProp (node, name);
-	new_val = g_strdup (buf);
-	xmlFree (buf);
-
-	/* We can use strcmp here whether the value is UTF8 or
-	 * not, since we only care if the bytes changed.
-	 */
-	if (!*val || strcmp (*val, new_val)) {
-		g_free (*val);
-		*val = new_val;
-		return TRUE;
+	if (buf == NULL) {
+		res = (*val != NULL);
+		if (res) {
+			g_free(*val);
+			*val = NULL;
+		}
 	} else {
-		g_free (new_val);
-		return FALSE;
+		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, *new_val;
+	char *buf;
+	int res;
 
-	buf = xmlNodeGetContent (node);
-        new_val = g_strdup (buf);
-	xmlFree (buf);
-
-	/* We can use strcmp here whether the value is UTF8 or
-	 * not, since we only care if the bytes changed.
-	 */
-	if (!*val || strcmp (*val, new_val)) {
-		g_free (*val);
-		*val = new_val;
-		return TRUE;
+	buf = xmlNodeGetContent(node);
+	if (buf == NULL) {
+		res = (*val != NULL);
+		if (res) {
+			g_free(*val);
+			*val = NULL;
+		}
 	} else {
-		g_free (new_val);
-		return FALSE;
+		res = *val == NULL || strcmp(*val, buf) != 0;
+		if (res) {
+			g_free(*val);
+			*val = g_strdup(buf);
+		}
+		xmlFree(buf);
 	}
+
+	return res;
 }
 
 static gboolean
@@ -238,8 +358,26 @@ xml_set_identity (xmlNodePtr node, EAcco
 		else if (!strcmp (node->name, "organization"))
 			changed |= xml_set_content (node, &id->organization);
 		else if (!strcmp (node->name, "signature")) {
-			changed |= xml_set_bool (node, "auto", &id->auto_signature);
-			changed |= xml_set_int (node, "default", &id->def_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;
+				}
+			}
 		}
 	}
 
@@ -320,6 +458,8 @@ e_account_set_from_xml (EAccount *accoun
 		} 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);
@@ -349,11 +489,22 @@ e_account_set_from_xml (EAccount *accoun
 					}
 				}
 			}
+		} 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;
 }
 
@@ -381,8 +532,7 @@ e_account_import (EAccount *dest, EAccou
 	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->def_signature = src->id->def_signature;
-	dest->id->auto_signature = src->id->auto_signature;
+	dest->id->sig_uid = g_strdup (src->id->sig_uid);
 	
 	g_free (dest->source->url);
 	dest->source->url = g_strdup (src->source->url);
@@ -409,6 +559,8 @@ e_account_import (EAccount *dest, EAccou
 	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;
@@ -424,6 +576,8 @@ e_account_import (EAccount *dest, EAccou
 	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);
 }
 
 
@@ -463,9 +617,7 @@ e_account_to_xml (EAccount *account)
 		xmlNewTextChild (id, NULL, "organization", account->id->organization);
 
 	node = xmlNewChild (id, NULL, "signature",NULL);
-	xmlSetProp (node, "auto", account->id->auto_signature ? "true" : "false");
-	sprintf (buf, "%d", account->id->def_signature);
-	xmlSetProp (node, "default", buf);
+	xmlSetProp (node, "uid", account->id->sig_uid);
 
 	src = xmlNewChild (root, NULL, "source", NULL);
 	xmlSetProp (src, "save-passwd", account->source->save_passwd ? "true" : "false");
@@ -494,6 +646,9 @@ e_account_to_xml (EAccount *account)
 	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");
@@ -511,6 +666,11 @@ e_account_to_xml (EAccount *account)
 	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);
 
@@ -552,4 +712,287 @@ e_account_uid_from_xml (const char *xml)
 	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;
 }
Index: evolution-data-server/libedataserver/e-account.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-account.h,v
retrieving revision 1.3
diff -u -p -r1.3 e-account.h
--- evolution-data-server/libedataserver/e-account.h	31 Aug 2005 04:26:10 -0000	1.3
+++ evolution-data-server/libedataserver/e-account.h	16 Dec 2005 12:01:35 -0000
@@ -30,17 +30,72 @@ G_BEGIN_DECLS
 #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 struct {
+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;
 	
-	int def_signature;
-	gboolean auto_signature;
+	char *sig_uid;
 } EAccountIdentity;
 
-typedef struct {
+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;
@@ -48,8 +103,7 @@ typedef struct {
 	gboolean save_passwd;
 } EAccountService;
 
-
-typedef struct {
+typedef struct _EAccount {
 	GObject parent_object;
 
 	char *name;
@@ -68,12 +122,16 @@ typedef struct {
 	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;
@@ -84,6 +142,7 @@ typedef struct {
 typedef struct {
 	GObjectClass parent_class;
 
+	void (*changed)(EAccount *, int field);
 } EAccountClass;
 
 
@@ -103,6 +162,31 @@ char     *e_account_to_xml       (EAccou
 
 
 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);
 
 G_END_DECLS
 

Index: evolution/calendar/gui/itip-utils.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.h,v
retrieving revision 1.20
diff -u -p -r1.20 itip-utils.h
--- evolution/calendar/gui/itip-utils.h	30 Sep 2005 11:26:55 -0000	1.20
+++ evolution/calendar/gui/itip-utils.h	16 Dec 2005 10:41:06 -0000
@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 
 typedef enum {
 	E_CAL_COMPONENT_METHOD_PUBLISH,
Index: evolution/composer/e-msg-composer-hdrs.h
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-hdrs.h,v
retrieving revision 1.34
diff -u -p -r1.34 e-msg-composer-hdrs.h
--- evolution/composer/e-msg-composer-hdrs.h	23 Dec 2004 02:42:11 -0000	1.34
+++ evolution/composer/e-msg-composer-hdrs.h	16 Dec 2005 10:41:06 -0000
@@ -29,7 +29,7 @@
 
 #include <bonobo/bonobo-ui-component.h>
 
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include <camel/camel-mime-message.h>
 #include <libebook/e-destination.h>
 
Index: evolution/composer/evolution-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/evolution-composer.c,v
retrieving revision 1.44
diff -u -p -r1.44 evolution-composer.c
--- evolution/composer/evolution-composer.c	19 Oct 2005 10:54:27 -0000	1.44
+++ evolution/composer/evolution-composer.c	16 Dec 2005 10:41:07 -0000
@@ -33,7 +33,7 @@
 #include <misc/e-gui-utils.h>
 #include "evolution-composer.h"
 #include "mail/mail-config.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include <camel/camel-mime-filter-tohtml.h>
 #include <camel/camel-stream-mem.h>
 
Index: evolution/e-util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
retrieving revision 1.138
diff -u -p -r1.138 Makefile.am
--- evolution/e-util/Makefile.am	12 Dec 2005 16:24:19 -0000	1.138
+++ evolution/e-util/Makefile.am	16 Dec 2005 10:41:07 -0000
@@ -41,8 +41,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				\
@@ -82,8 +80,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				\
Index: evolution/mail/em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.36
diff -u -p -r1.36 em-account-editor.c
--- evolution/mail/em-account-editor.c	21 Sep 2005 06:41:27 -0000	1.36
+++ evolution/mail/em-account-editor.c	16 Dec 2005 10:41:08 -0000
@@ -67,7 +67,7 @@
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-signature-list.h>
 
 #include "e-util/e-error.h"
Index: evolution/mail/em-account-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-prefs.c,v
retrieving revision 1.20
diff -u -p -r1.20 em-account-prefs.c
--- evolution/mail/em-account-prefs.c	10 Jul 2005 10:03:56 -0000	1.20
+++ evolution/mail/em-account-prefs.c	16 Dec 2005 10:41:08 -0000
@@ -40,7 +40,7 @@
 #include "mail-ops.h"
 #include "mail-send-recv.h"
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-error.h"
 
 #include "em-account-prefs.h"
Index: evolution/mail/em-composer-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-composer-utils.c,v
retrieving revision 1.46
diff -u -p -r1.46 em-composer-utils.c
--- evolution/mail/em-composer-utils.c	23 Nov 2005 06:46:51 -0000	1.46
+++ evolution/mail/em-composer-utils.c	16 Dec 2005 10:41:09 -0000
@@ -47,7 +47,7 @@
 #include "em-format-quote.h"
 #include "em-event.h"
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 
 #include <camel/camel-multipart.h>
 #include <camel/camel-string-utils.h>
Index: evolution/mail/em-folder-tree-model.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree-model.h,v
retrieving revision 1.20
diff -u -p -r1.20 em-folder-tree-model.h
--- evolution/mail/em-folder-tree-model.h	10 Jun 2004 22:08:41 -0000	1.20
+++ evolution/mail/em-folder-tree-model.h	16 Dec 2005 10:41:09 -0000
@@ -31,7 +31,7 @@
 
 #include <camel/camel-store.h>
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 
 #ifdef __cplusplus
 extern "C" {
Index: evolution/mail/em-migrate.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-migrate.c,v
retrieving revision 1.50
diff -u -p -r1.50 em-migrate.c
--- evolution/mail/em-migrate.c	17 Jun 2005 15:20:29 -0000	1.50
+++ evolution/mail/em-migrate.c	16 Dec 2005 10:41:10 -0000
@@ -58,7 +58,7 @@
 #include <e-util/e-xml-utils.h>
 
 #include "e-util/e-bconf-map.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-signature-list.h"
 #include "e-util/e-error.h"
 
Index: evolution/mail/em-subscribe-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-subscribe-editor.c,v
retrieving revision 1.19
diff -u -p -r1.19 em-subscribe-editor.c
--- evolution/mail/em-subscribe-editor.c	2 Aug 2005 03:10:09 -0000	1.19
+++ evolution/mail/em-subscribe-editor.c	16 Dec 2005 10:41:10 -0000
@@ -36,7 +36,7 @@
 #include "camel/camel-exception.h"
 #include "camel/camel-store.h"
 #include "camel/camel-session.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 
 #include "em-subscribe-editor.h"
 
Index: evolution/mail/em-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
retrieving revision 1.68
diff -u -p -r1.68 em-utils.c
--- evolution/mail/em-utils.c	18 Oct 2005 08:31:39 -0000	1.68
+++ evolution/mail/em-utils.c	16 Dec 2005 10:41:11 -0000
@@ -54,7 +54,7 @@
 #include "message-tag-followup.h"
 
 #include <e-util/e-mktemp.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-dialog-utils.h>
 #include "e-util/e-error.h"
 
Index: evolution/mail/mail-config.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
retrieving revision 1.321
diff -u -p -r1.321 mail-config.c
--- evolution/mail/mail-config.c	22 Oct 2005 08:18:50 -0000	1.321
+++ evolution/mail/mail-config.c	16 Dec 2005 10:41:11 -0000
@@ -54,7 +54,7 @@
 #include <e-util/e-util.h>
 #include <misc/e-gui-utils.h>
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-signature-list.h>
 
 #include <camel/camel-service.h>
Index: evolution/mail/mail-crypto.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-crypto.c,v
retrieving revision 1.50
diff -u -p -r1.50 mail-crypto.c
--- evolution/mail/mail-crypto.c	31 Mar 2004 10:09:04 -0000	1.50
+++ evolution/mail/mail-crypto.c	16 Dec 2005 10:41:11 -0000
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include <camel/camel-gpg-context.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 
 #include "mail-crypto.h"
 #include "mail-session.h"
Index: evolution/mail/mail-ops.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-ops.h,v
retrieving revision 1.72
diff -u -p -r1.72 mail-ops.h
--- evolution/mail/mail-ops.h	21 Jul 2005 04:15:21 -0000	1.72
+++ evolution/mail/mail-ops.h	16 Dec 2005 10:41:11 -0000
@@ -37,7 +37,7 @@ extern "C" {
 #include "camel/camel-operation.h"
 
 #include "libedataserver/e-msgport.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
 		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok,
Index: evolution/mail/mail-send-recv.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-send-recv.c,v
retrieving revision 1.103
diff -u -p -r1.103 mail-send-recv.c
--- evolution/mail/mail-send-recv.c	6 Dec 2005 08:37:28 -0000	1.103
+++ evolution/mail/mail-send-recv.c	16 Dec 2005 10:41:12 -0000
@@ -41,7 +41,7 @@
 #include <libgnome/gnome-i18n.h>
 
 #include "e-util/e-gtk-utils.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 
 #include "misc/e-clipped-label.h"
 #include "em-filter-rule.h"
Index: evolution/mail/mail-vfolder.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-vfolder.c,v
retrieving revision 1.135
diff -u -p -r1.135 mail-vfolder.c
--- evolution/mail/mail-vfolder.c	7 Aug 2005 21:18:18 -0000	1.135
+++ evolution/mail/mail-vfolder.c	16 Dec 2005 10:41:12 -0000
@@ -38,7 +38,7 @@
 #include "mail-mt.h"
 #include "em-utils.h"
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-error.h"
 
 #include "camel/camel-vee-folder.h"
Index: evolution/mail/importers/netscape-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/netscape-importer.c,v
retrieving revision 1.20
diff -u -p -r1.20 netscape-importer.c
--- evolution/mail/importers/netscape-importer.c	28 Sep 2005 10:55:20 -0000	1.20
+++ evolution/mail/importers/netscape-importer.c	16 Dec 2005 10:41:13 -0000
@@ -56,7 +56,7 @@
 #include "mail/em-filter-folder-element.h"
 #include <filter/filter-int.h>
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-signature-list.h"
 
 #include "mail/mail-mt.h"
Index: evolution/plugins/exchange-operations/exchange-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
retrieving revision 1.24
diff -u -p -r1.24 exchange-account-setup.c
--- evolution/plugins/exchange-operations/exchange-account-setup.c	12 Dec 2005 08:16:54 -0000	1.24
+++ evolution/plugins/exchange-operations/exchange-account-setup.c	16 Dec 2005 10:41:14 -0000
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include "e-util/e-error.h"
 
 #include <string.h>
Index: evolution/plugins/exchange-operations/exchange-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-calendar.c,v
retrieving revision 1.11
diff -u -p -r1.11 exchange-calendar.c
--- evolution/plugins/exchange-operations/exchange-calendar.c	28 Sep 2005 14:30:54 -0000	1.11
+++ evolution/plugins/exchange-operations/exchange-calendar.c	16 Dec 2005 10:41:14 -0000
@@ -32,7 +32,7 @@
 #include "calendar/gui/dialogs/calendar-setup.h"
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include "e-util/e-error.h"
 
 #include "exchange-operations.h"
Index: evolution/plugins/exchange-operations/exchange-config-listener.h
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-config-listener.h,v
retrieving revision 1.4
diff -u -p -r1.4 exchange-config-listener.h
--- evolution/plugins/exchange-operations/exchange-config-listener.h	22 Aug 2005 13:18:42 -0000	1.4
+++ evolution/plugins/exchange-operations/exchange-config-listener.h	16 Dec 2005 10:41:14 -0000
@@ -8,7 +8,7 @@
 #include <exchange-account.h>
 
 #include "exchange-types.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-source-group.h>
 
Index: evolution/plugins/exchange-operations/exchange-contacts.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-contacts.c,v
retrieving revision 1.10
diff -u -p -r1.10 exchange-contacts.c
--- evolution/plugins/exchange-operations/exchange-contacts.c	28 Sep 2005 14:30:54 -0000	1.10
+++ evolution/plugins/exchange-operations/exchange-contacts.c	16 Dec 2005 10:41:14 -0000
@@ -34,7 +34,7 @@
 
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include "e-util/e-error.h"
 
 #include "exchange-operations.h"
Index: evolution/plugins/groupwise-account-setup/camel-gw-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/camel-gw-listener.c,v
retrieving revision 1.41
diff -u -p -r1.41 camel-gw-listener.c
--- evolution/plugins/groupwise-account-setup/camel-gw-listener.c	24 Nov 2005 09:45:55 -0000	1.41
+++ evolution/plugins/groupwise-account-setup/camel-gw-listener.c	16 Dec 2005 10:41:14 -0000
@@ -31,7 +31,7 @@
 #include <e-gw-connection.h>
 #include <libedataserverui/e-passwords.h>
 #include "e-util/e-error.h"
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 
 /*stores some info about all currently existing groupwise accounts 
   list of GwAccountInfo structures */
Index: evolution/plugins/groupwise-account-setup/camel-gw-listener.h
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/camel-gw-listener.h,v
retrieving revision 1.6
diff -u -p -r1.6 camel-gw-listener.h
--- evolution/plugins/groupwise-account-setup/camel-gw-listener.h	10 Jul 2005 09:24:36 -0000	1.6
+++ evolution/plugins/groupwise-account-setup/camel-gw-listener.h	16 Dec 2005 10:41:14 -0000
@@ -24,7 +24,7 @@
 #ifndef CAMEL_GW_LISTENER_H
 #define CAMEL_GW_LISTENER_H
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include<libedataserver/e-source.h>
 #include<libedataserver/e-source-list.h>
 #include <camel/camel-url.h>
Index: evolution/plugins/groupwise-features/junk-mail-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/junk-mail-settings.c,v
retrieving revision 1.4
diff -u -p -r1.4 junk-mail-settings.c
--- evolution/plugins/groupwise-features/junk-mail-settings.c	24 Aug 2005 03:15:26 -0000	1.4
+++ evolution/plugins/groupwise-features/junk-mail-settings.c	16 Dec 2005 10:41:14 -0000
@@ -35,7 +35,7 @@
 #include <mail/em-folder-view.h>
 #include <e-gw-connection.h>
 #include "mail/em-account-editor.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include "mail/em-config.h"
 #include "share-folder.h"
 #include "junk-settings.h"
Index: evolution/plugins/groupwise-features/mail-send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/mail-send-options.c,v
retrieving revision 1.5
diff -u -p -r1.5 mail-send-options.c
--- evolution/plugins/groupwise-features/mail-send-options.c	10 Nov 2005 07:00:09 -0000	1.5
+++ evolution/plugins/groupwise-features/mail-send-options.c	16 Dec 2005 10:41:14 -0000
@@ -35,7 +35,7 @@
 #include "mail/em-utils.h"
 
 #include "composer/e-msg-composer.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 
 #include "misc/e-send-options.h"
 
Index: evolution/plugins/groupwise-features/proxy-login.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy-login.c,v
retrieving revision 1.3
diff -u -p -r1.3 proxy-login.c
--- evolution/plugins/groupwise-features/proxy-login.c	20 Oct 2005 08:19:37 -0000	1.3
+++ evolution/plugins/groupwise-features/proxy-login.c	16 Dec 2005 10:41:14 -0000
@@ -53,7 +53,7 @@
 #include <camel/camel-url.h>
 #include <camel/camel-store.h>
 #include <mail/mail-ops.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include <e-util/e-error.h>
 #include <e-util/e-icon-factory.h>
 
Index: evolution/plugins/groupwise-features/proxy.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy.c,v
retrieving revision 1.14
diff -u -p -r1.14 proxy.c
--- evolution/plugins/groupwise-features/proxy.c	5 Dec 2005 06:04:12 -0000	1.14
+++ evolution/plugins/groupwise-features/proxy.c	16 Dec 2005 10:41:14 -0000
@@ -55,8 +55,8 @@
 #include <mail/mail-component.h>
 #include <mail/mail-ops.h>
 #include <mail/mail-session.h>
-#include <e-util/e-account.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 
 #include <camel/camel-url.h>
Index: evolution/plugins/groupwise-features/proxy.h
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy.h,v
retrieving revision 1.2
diff -u -p -r1.2 proxy.h
--- evolution/plugins/groupwise-features/proxy.h	10 Aug 2005 06:50:07 -0000	1.2
+++ evolution/plugins/groupwise-features/proxy.h	16 Dec 2005 10:41:14 -0000
@@ -22,7 +22,7 @@
  */
 
 #include <gtk/gtkwidget.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include <gtk/gtk.h>
 
 #define TYPE_PROXY_DIALOG       (proxy_dialog_get_type ())
Index: evolution/plugins/groupwise-features/send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/send-options.c,v
retrieving revision 1.3
diff -u -p -r1.3 send-options.c
--- evolution/plugins/groupwise-features/send-options.c	7 Jul 2005 17:06:27 -0000	1.3
+++ evolution/plugins/groupwise-features/send-options.c	16 Dec 2005 10:41:14 -0000
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include <misc/e-send-options.h>
 #include <mail/em-config.h>
 #include <e-gw-connection.h>
Index: evolution/plugins/hula-account-setup/camel-hula-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/hula-account-setup/camel-hula-listener.c,v
retrieving revision 1.2
diff -u -p -r1.2 camel-hula-listener.c
--- evolution/plugins/hula-account-setup/camel-hula-listener.c	14 Nov 2005 19:34:06 -0000	1.2
+++ evolution/plugins/hula-account-setup/camel-hula-listener.c	16 Dec 2005 10:41:15 -0000
@@ -29,7 +29,7 @@
 #include <camel/camel-i18n.h>
 #include <libedataserverui/e-passwords.h>
 #include <e-util/e-error.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include "camel-hula-listener.h"
 
 
Index: evolution/plugins/hula-account-setup/camel-hula-listener.h
===================================================================
RCS file: /cvs/gnome/evolution/plugins/hula-account-setup/camel-hula-listener.h,v
retrieving revision 1.1
diff -u -p -r1.1 camel-hula-listener.h
--- evolution/plugins/hula-account-setup/camel-hula-listener.h	14 Nov 2005 17:33:39 -0000	1.1
+++ evolution/plugins/hula-account-setup/camel-hula-listener.h	16 Dec 2005 10:41:15 -0000
@@ -24,7 +24,7 @@
 #ifndef CAMEL_HULA_LISTENER_H
 #define CAMEL_HULA_LISTENER_H
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include<libedataserver/e-source.h>
 #include<libedataserver/e-source-list.h>
 #include <camel/camel-url.h>
Index: evolution/plugins/itip-formatter/itip-formatter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-formatter.c,v
retrieving revision 1.54
diff -u -p -r1.54 itip-formatter.c
--- evolution/plugins/itip-formatter/itip-formatter.c	7 Nov 2005 08:56:21 -0000	1.54
+++ evolution/plugins/itip-formatter/itip-formatter.c	16 Dec 2005 10:41:15 -0000
@@ -46,7 +46,7 @@
 #include <mail/em-config.h>
 #include <mail/em-format-html.h>
 #include <mail/em-utils.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-error.h>
 #include <calendar/gui/calendar-config.h>
Index: evolution/plugins/itip-formatter/itip-view.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-view.c,v
retrieving revision 1.19
diff -u -p -r1.19 itip-view.c
--- evolution/plugins/itip-formatter/itip-view.c	24 Nov 2005 14:28:38 -0000	1.19
+++ evolution/plugins/itip-formatter/itip-view.c	16 Dec 2005 10:41:15 -0000
@@ -40,7 +40,7 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <mail/em-format-hook.h>
 #include <mail/em-format-html.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-gtk-utils.h>
 #include <e-util/e-util.h>
Index: evolution/plugins/mail-account-disable/mail-account-disable.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-account-disable/mail-account-disable.c,v
retrieving revision 1.2
diff -u -p -r1.2 mail-account-disable.c
--- evolution/plugins/mail-account-disable/mail-account-disable.c	24 Aug 2005 03:14:49 -0000	1.2
+++ evolution/plugins/mail-account-disable/mail-account-disable.c	16 Dec 2005 10:41:15 -0000
@@ -33,8 +33,8 @@
 #include <mail/em-popup.h>
 #include <mail/em-account-editor.h>
 #include <mail/mail-config.h>
-#include <e-util/e-account.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
 
 #define ACCOUNT_DISABLE 0
 #define PROXY_LOGOUT 1
Index: evolution/plugins/mail-remote/evolution-mail-session.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-remote/evolution-mail-session.c,v
retrieving revision 1.7
diff -u -p -r1.7 evolution-mail-session.c
--- evolution/plugins/mail-remote/evolution-mail-session.c	15 Aug 2005 04:40:55 -0000	1.7
+++ evolution/plugins/mail-remote/evolution-mail-session.c	16 Dec 2005 10:41:15 -0000
@@ -31,7 +31,7 @@
 #include <bonobo/bonobo-exception.h>
 #include "evolution-mail-session.h"
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 
 #include "evolution-mail-store.h"
 #include "e-corba-utils.h"
Index: evolution/plugins/mail-remote/evolution-mail-store.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/mail-remote/evolution-mail-store.c,v
retrieving revision 1.8
diff -u -p -r1.8 evolution-mail-store.c
--- evolution/plugins/mail-remote/evolution-mail-store.c	15 Aug 2005 04:40:55 -0000	1.8
+++ evolution/plugins/mail-remote/evolution-mail-store.c	16 Dec 2005 10:41:15 -0000
@@ -44,7 +44,7 @@
 #include <camel/camel-mime-message.h>
 #include <camel/camel-folder.h>
 
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 
 #include "mail/mail-component.h"
 #include "mail/mail-send-recv.h"

Index: evolution-exchange/storage/exchange-autoconfig-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-autoconfig-wizard.c,v
retrieving revision 1.6
diff -u -p -r1.6 exchange-autoconfig-wizard.c
--- evolution-exchange/storage/exchange-autoconfig-wizard.c	14 Jun 2005 13:12:43 -0000	1.6
+++ evolution-exchange/storage/exchange-autoconfig-wizard.c	16 Dec 2005 09:16:06 -0000
@@ -29,8 +29,8 @@
 #include <e2k-utils.h>
 #include "exchange-autoconfig-wizard.h"
 
-#include <e-util/e-account.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-dialog-utils.h>
 #include <libedataserverui/e-passwords.h>
 
Index: evolution-exchange/storage/exchange-config-listener.h
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-config-listener.h,v
retrieving revision 1.8
diff -u -p -r1.8 exchange-config-listener.h
--- evolution-exchange/storage/exchange-config-listener.h	22 Aug 2005 14:22:02 -0000	1.8
+++ evolution-exchange/storage/exchange-config-listener.h	16 Dec 2005 09:16:06 -0000
@@ -6,7 +6,7 @@
 
 #include <exchange-types.h>
 #include <exchange-constants.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-source-group.h>
 
Index: evolution-exchange/storage/exchange-delegates-control.h
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-delegates-control.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 exchange-delegates-control.h
--- evolution-exchange/storage/exchange-delegates-control.h	11 May 2004 15:09:04 -0000	1.1.1.1
+++ evolution-exchange/storage/exchange-delegates-control.h	16 Dec 2005 09:16:06 -0000
@@ -11,7 +11,7 @@
 #include <shell/evolution-config-control.h>
 
 #include <bonobo/bonobo-object.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include <glade/glade-xml.h>
 #include <gtk/gtkliststore.h>
 

Index: evolution-data-server/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.350
diff -u -p -r1.350 ChangeLog
--- evolution-data-server/ChangeLog	13 Dec 2005 14:07:16 -0000	1.350
+++ evolution-data-server/ChangeLog	19 Dec 2005 07:55:48 -0000
@@ -1,3 +1,8 @@
+2005-12-19  Simon.zheng  <simon zheng sun com>
+
+        * libedataserver/e-util.c : Rename this file as e-data-serfer-util.c
+	libedataserver/e-util.h : Rename this file as e-data-server-util.h
+
 2005-12-13  Tor Lillqvist  <tml novell com>
 
 	* libedataserver/e-uid.c (e_uid_new): Use g_get_host_name() when
Index: evolution-data-server/addressbook/backends/file/e-book-backend-file.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/file/e-book-backend-file.c,v
retrieving revision 1.39
diff -u -p -r1.39 e-book-backend-file.c
--- evolution-data-server/addressbook/backends/file/e-book-backend-file.c	8 Dec 2005 04:29:33 -0000	1.39
+++ evolution-data-server/addressbook/backends/file/e-book-backend-file.c	19 Dec 2005 07:55:48 -0000
@@ -42,7 +42,7 @@
 
 #include "libedataserver/e-dbhash.h"
 #include "libedataserver/e-db3-utils.h"
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 
 #include "libebook/e-contact.h"
 
Index: evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c,v
retrieving revision 1.70
diff -u -p -r1.70 e-book-backend-groupwise.c
--- evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c	8 Dec 2005 04:34:48 -0000	1.70
+++ evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c	19 Dec 2005 07:55:48 -0000
@@ -35,7 +35,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "libedataserver/e-sexp.h"
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 #include "libedataserver/e-url.h" 
 #include "libebook/e-contact.h"
 #include "libedata-book/e-book-backend-sexp.h"
Index: evolution-data-server/addressbook/backends/vcf/e-book-backend-vcf.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/vcf/e-book-backend-vcf.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-book-backend-vcf.c
--- evolution-data-server/addressbook/backends/vcf/e-book-backend-vcf.c	8 Dec 2005 04:40:34 -0000	1.21
+++ evolution-data-server/addressbook/backends/vcf/e-book-backend-vcf.c	19 Dec 2005 07:55:48 -0000
@@ -40,7 +40,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 
 #include "libebook/e-contact.h"
  
Index: evolution-data-server/addressbook/libebook/e-address-western.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-address-western.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-address-western.c
--- evolution-data-server/addressbook/libebook/e-address-western.c	4 May 2005 08:46:12 -0000	1.3
+++ evolution-data-server/addressbook/libebook/e-address-western.c	19 Dec 2005 07:55:49 -0000
@@ -14,7 +14,7 @@
 #include <glib.h>
 
 #include "e-address-western.h"
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 
 /* These are the keywords that will distinguish the start of an extended
    address. */
Index: evolution-data-server/addressbook/libebook/e-contact.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.c,v
retrieving revision 1.54
diff -u -p -r1.54 e-contact.c
--- evolution-data-server/addressbook/libebook/e-contact.c	25 Nov 2005 03:28:51 -0000	1.54
+++ evolution-data-server/addressbook/libebook/e-contact.c	19 Dec 2005 07:55:50 -0000
@@ -33,7 +33,7 @@
 #include "e-name-western.h"
 
 #ifdef G_OS_WIN32
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #undef EVOLUTION_LOCALEDIR
 #define EVOLUTION_LOCALEDIR e_util_get_localedir ()
 #endif
Index: evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c,v
retrieving revision 1.14
diff -u -p -r1.14 e-book-backend-sexp.c
--- evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c	9 Dec 2005 10:56:46 -0000	1.14
+++ evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c	19 Dec 2005 07:55:50 -0000
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <libedataserver/e-sexp.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include "e-book-backend-sexp.h"
 
 static GObjectClass *parent_class;
Index: evolution-data-server/addressbook/libedata-book/e-book-backend-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libedata-book/e-book-backend-summary.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-book-backend-summary.c
--- evolution-data-server/addressbook/libedata-book/e-book-backend-summary.c	9 Dec 2005 10:56:46 -0000	1.13
+++ evolution-data-server/addressbook/libedata-book/e-book-backend-summary.c	19 Dec 2005 07:55:50 -0000
@@ -34,7 +34,7 @@
 #include <glib/gstdio.h>
 
 #include "libedataserver/e-sexp.h"
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 
 #include "libebook/e-contact.h"
 
Index: evolution-data-server/calendar/backends/file/e-cal-backend-file.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/e-cal-backend-file.c,v
retrieving revision 1.68
diff -u -p -r1.68 e-cal-backend-file.c
--- evolution-data-server/calendar/backends/file/e-cal-backend-file.c	8 Dec 2005 06:17:19 -0000	1.68
+++ evolution-data-server/calendar/backends/file/e-cal-backend-file.c	19 Dec 2005 07:55:51 -0000
@@ -33,7 +33,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-time-util.h>
Index: evolution-data-server/calendar/backends/weather/e-weather-source-ccf.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/e-weather-source-ccf.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-weather-source-ccf.c
--- evolution-data-server/calendar/backends/weather/e-weather-source-ccf.c	9 Dec 2005 11:27:19 -0000	1.4
+++ evolution-data-server/calendar/backends/weather/e-weather-source-ccf.c	19 Dec 2005 07:55:52 -0000
@@ -39,7 +39,7 @@
 
 #ifdef G_OS_WIN32
 
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 
 /* The localtime_r() in <pthread.h> doesn't guard against localtime()
  * returning NULL
Index: evolution-data-server/calendar/libecal/e-cal-util.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-util.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-cal-util.c
--- evolution-data-server/calendar/libecal/e-cal-util.c	9 Dec 2005 11:33:55 -0000	1.13
+++ evolution-data-server/calendar/libecal/e-cal-util.c	19 Dec 2005 07:55:53 -0000
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 #include "e-cal-util.h"
 
 
Index: evolution-data-server/calendar/libedata-cal/e-cal-backend-sexp.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-cal-backend-sexp.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-cal-backend-sexp.c
--- evolution-data-server/calendar/libedata-cal/e-cal-backend-sexp.c	6 May 2005 11:22:28 -0000	1.21
+++ evolution-data-server/calendar/libedata-cal/e-cal-backend-sexp.c	19 Dec 2005 07:55:54 -0000
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libecal/e-cal-time-util.h>
 
 #include "e-cal-backend-sexp.h"
Index: evolution-data-server/camel/camel-debug.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-debug.c,v
retrieving revision 1.5
diff -u -p -r1.5 camel-debug.c
--- evolution-data-server/camel/camel-debug.c	15 Sep 2005 12:24:59 -0000	1.5
+++ evolution-data-server/camel/camel-debug.c	19 Dec 2005 07:56:00 -0000
@@ -25,7 +25,7 @@
 
 #include <pthread.h>
 
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 #include "camel-debug.h"
 
 int camel_verbose_debug;
Index: evolution-data-server/camel/camel-file-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-file-utils.c,v
retrieving revision 1.15
diff -u -p -r1.15 camel-file-utils.c
--- evolution-data-server/camel/camel-file-utils.c	8 Dec 2005 06:41:55 -0000	1.15
+++ evolution-data-server/camel/camel-file-utils.c	19 Dec 2005 07:56:00 -0000
@@ -41,7 +41,7 @@
 #define EWOULDBLOCK EAGAIN
 #endif
 
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 
 #include "camel-file-utils.h"
 #include "camel-operation.h"
Index: evolution-data-server/camel/camel-win32.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-win32.c,v
retrieving revision 1.4
diff -u -p -r1.4 camel-win32.c
--- evolution-data-server/camel/camel-win32.c	1 Dec 2005 10:32:30 -0000	1.4
+++ evolution-data-server/camel/camel-win32.c	19 Dec 2005 07:56:05 -0000
@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 
 #include "camel.h"
 
Index: evolution-data-server/libedataserver/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- evolution-data-server/libedataserver/Makefile.am	8 Dec 2005 07:43:36 -0000	1.27
+++ evolution-data-server/libedataserver/Makefile.am	19 Dec 2005 07:56:25 -0000
@@ -39,7 +39,7 @@ libedataserver_1_2_la_SOURCES =		\
 	e-time-utils.c			\
 	e-uid.c				\
 	e-url.c				\
-	e-util.c			\
+	e-data-server-util.c			\
 	e-trie.c			\
 	e-xml-utils.c			\
 	e-xml-hash-utils.c		\
@@ -80,7 +80,7 @@ libedataserverinclude_HEADERS =		\
 	e-trie.h			\
 	e-uid.h				\
 	e-url.h				\
-	e-util.h			\
+	e-data-server-util.h			\
 	e-xml-utils.h			\
 	e-xml-hash-utils.h		\
 	md5-utils.h
Index: evolution-data-server/libedataserver/e-file-cache.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-file-cache.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-file-cache.c
--- evolution-data-server/libedataserver/e-file-cache.c	8 Dec 2005 07:50:28 -0000	1.15
+++ evolution-data-server/libedataserver/e-file-cache.c	19 Dec 2005 07:56:25 -0000
@@ -27,7 +27,7 @@
 #include <glib/gstdio.h>
 
 #include "e-file-cache.h"
-#include "e-util.h"
+#include "e-data-server-util.h"
 #include "e-xml-hash-utils.h"
 
 struct _EFileCachePrivate {
Index: evolution-data-server/libedataserver/e-msgport.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-msgport.c,v
retrieving revision 1.5
diff -u -p -r1.5 e-msgport.c
--- evolution-data-server/libedataserver/e-msgport.c	9 Dec 2005 10:14:14 -0000	1.5
+++ evolution-data-server/libedataserver/e-msgport.c	19 Dec 2005 07:56:26 -0000
@@ -44,7 +44,7 @@
 #endif
 
 #include "e-msgport.h"
-#include "e-util.h"
+#include "e-data-server-util.h"
 
 #define m(x)			/* msgport debug */
 #define t(x)			/* thread debug */
Index: evolution-data-server/libedataserver/e-time-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-time-utils.c,v
retrieving revision 1.5
diff -u -p -r1.5 e-time-utils.c
--- evolution-data-server/libedataserver/e-time-utils.c	25 Nov 2005 01:48:30 -0000	1.5
+++ evolution-data-server/libedataserver/e-time-utils.c	19 Dec 2005 07:56:26 -0000
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 #include "e-time-utils.h"
-#include "e-util.h"
+#include "e-data-server-util.h"
 
 #ifdef G_OS_WIN32
 /* The localtime_r() definition in pthreads-win32's pthread.h doesn't guard
Index: evolution-data-server/libedataserver/e-util.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-util.c,v
retrieving revision 1.14
diff -u -p -r1.14 e-util.c
--- evolution-data-server/libedataserver/e-util.c	9 Dec 2005 10:31:38 -0000	1.14
+++ evolution-data-server/libedataserver/e-util.c	19 Dec 2005 07:56:26 -0000
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include "e-util.h"
+#include "e-data-server-util.h"
 
 /**
  * e_util_mkdir_hier:
Index: evolution-data-server/servers/exchange/lib/e2k-autoconfig.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/lib/e2k-autoconfig.c,v
retrieving revision 1.9
diff -u -p -r1.9 e2k-autoconfig.c
--- evolution-data-server/servers/exchange/lib/e2k-autoconfig.c	17 Dec 2005 06:51:55 -0000	1.9
+++ evolution-data-server/servers/exchange/lib/e2k-autoconfig.c	19 Dec 2005 07:56:28 -0000
@@ -63,7 +63,7 @@
 #include "e2k-xml-utils.h"
 #include "xntlm.h"
 
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-passwords.h>
 #include <gconf/gconf-client.h>
 #include <libxml/tree.h>
Index: evolution-data-server/servers/exchange/storage/e-folder-exchange.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/e-folder-exchange.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-folder-exchange.c
--- evolution-data-server/servers/exchange/storage/e-folder-exchange.c	13 Dec 2005 03:54:29 -0000	1.8
+++ evolution-data-server/servers/exchange/storage/e-folder-exchange.c	19 Dec 2005 07:56:29 -0000
@@ -36,7 +36,7 @@
 #include <glib/gstdio.h>
 
 #include "libedataserver/e-source-list.h"
-#include "libedataserver/e-util.h"
+#include "libedataserver/e-data-server-util.h"
 #include "libedataserver/e-xml-utils.h"
 
 #include "e-folder-exchange.h"
Index: evolution-data-server/servers/exchange/storage/e-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/e-folder.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-folder.c
--- evolution-data-server/servers/exchange/storage/e-folder.c	31 Aug 2005 04:26:09 -0000	1.4
+++ evolution-data-server/servers/exchange/storage/e-folder.c	19 Dec 2005 07:56:29 -0000
@@ -29,7 +29,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 
 #define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
Index: evolution-data-server/servers/exchange/storage/e-storage.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/e-storage.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-storage.c
--- evolution-data-server/servers/exchange/storage/e-storage.c	31 Aug 2005 04:26:09 -0000	1.4
+++ evolution-data-server/servers/exchange/storage/e-storage.c	19 Dec 2005 07:56:29 -0000
@@ -30,7 +30,7 @@
 #include "e-shell-marshal.h"
 
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 
 #include <string.h>
 
Index: evolution-data-server/src/server.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/server.c,v
retrieving revision 1.29
diff -u -p -r1.29 server.c
--- evolution-data-server/src/server.c	25 Nov 2005 03:53:43 -0000	1.29
+++ evolution-data-server/src/server.c	19 Dec 2005 07:56:31 -0000
@@ -48,7 +48,7 @@
 #include <libedata-cal/e-data-cal-factory.h>
 
 #ifdef G_OS_WIN32
-#include <libedataserver/e-util.h>
+#include <libedataserver/e-data-server-util.h>
 #endif
 
 #include "server-interface-check.h"