Merge new-ui-branch into the trunk.

svn path=/trunk/; revision=22966

6 files changed, 139 insertions, 106 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index b698c2cf57..1bc29bb5df 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,37 @@
+2003-10-08  Chris Toshok  <toshok@ximian.com>
+
+	* evolution-composer.c (corba_recipientlist_to_destv): EDestination =>
+	EABDestination, and e_destination => eab_destination.
+	(impl_Composer_set_headers): same.
+
+	* e-msg-composer.c (update_auto_recipients): EDestination =>
+	EABDestination, and e_destination => eab_destination.
+	(e_msg_composer_new_with_message): same.
+	(add_recipients): same.
+	(handle_mailto): same.
+	(e_msg_composer_set_headers): same.
+	(e_msg_composer_get_recipients): same.
+	(e_msg_composer_get_to): same.
+	(e_msg_composer_get_cc): same.
+	(e_msg_composer_get_bcc): same.
+
+	* e-msg-composer.h: EDestination => EABDestination, and
+	e_destination => eab_destination.
+
+	* e-msg-composer-hdrs.c (set_recipients_from_destv): EDestination
+	=> EABDestination, and e_destination => eab_destination.
+	(e_msg_composer_hdrs_to_message_internal): same.
+	(e_msg_composer_hdrs_set_to): same.
+	(e_msg_composer_hdrs_set_cc): same.
+	(e_msg_composer_hdrs_set_bcc): same.
+	(e_msg_composer_hdrs_get_to): same.
+	(e_msg_composer_hdrs_get_cc): same.
+	(e_msg_composer_hdrs_get_bcc): same.
+	(e_msg_composer_hdrs_get_recipients): same.
+
+	* e-msg-composer-hdrs.h: EDestination => EABDestination, and
+	e_destination => eab_destination.
+
 2003-09-26  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer.c (save): Don't blindly claim that the file
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index e6d4bebe17..23c24a339a 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -51,7 +51,6 @@
 #include "evolution-folder-selector-button.h"
 #include "e-msg-composer-hdrs.h"
 #include "mail/mail-config.h"
-#include "addressbook/backend/ebook/e-book-util.h"
 
 extern EvolutionShellClient *global_shell_client;
 
@@ -837,9 +836,9 @@ e_msg_composer_hdrs_new (BonoboUIComponent *uic, int visible_mask, int visible_f
 
 static void
 set_recipients_from_destv (CamelMimeMessage *msg,
-			   EDestination **to_destv,
-			   EDestination **cc_destv,
-			   EDestination **bcc_destv,
+			   EABDestination **to_destv,
+			   EABDestination **cc_destv,
+			   EABDestination **bcc_destv,
 			   gboolean redirect)
 {
 	CamelInternetAddress *to_addr;
@@ -856,12 +855,12 @@ set_recipients_from_destv (CamelMimeMessage *msg,
 	
 	if (to_destv) {
 		for (i = 0; to_destv[i] != NULL; ++i) {
-			text_addr = e_destination_get_address (to_destv[i]);
+			text_addr = eab_destination_get_address (to_destv[i]);
 			
 			if (text_addr && *text_addr) {
 				target = to_addr;
-				if (e_destination_is_evolution_list (to_destv[i])
-				    && !e_destination_list_show_addresses (to_destv[i])) {
+				if (eab_destination_is_evolution_list (to_destv[i])
+				    && !eab_destination_list_show_addresses (to_destv[i])) {
 					target = bcc_addr;
 					seen_hidden_list = TRUE;
 				}
@@ -873,11 +872,11 @@ set_recipients_from_destv (CamelMimeMessage *msg,
 	
 	if (cc_destv) {
 		for (i = 0; cc_destv[i] != NULL; ++i) {
-			text_addr = e_destination_get_address (cc_destv[i]);
+			text_addr = eab_destination_get_address (cc_destv[i]);
 			if (text_addr && *text_addr) {
 				target = cc_addr;
-				if (e_destination_is_evolution_list (cc_destv[i])
-				    && !e_destination_list_show_addresses (cc_destv[i])) {
+				if (eab_destination_is_evolution_list (cc_destv[i])
+				    && !eab_destination_list_show_addresses (cc_destv[i])) {
 					target = bcc_addr;
 					seen_hidden_list = TRUE;
 				}
@@ -889,7 +888,7 @@ set_recipients_from_destv (CamelMimeMessage *msg,
 	
 	if (bcc_destv) {
 		for (i = 0; bcc_destv[i] != NULL; ++i) {
-			text_addr = e_destination_get_address (bcc_destv[i]);
+			text_addr = eab_destination_get_address (bcc_destv[i]);
 			if (text_addr && *text_addr) {				
 				camel_address_decode (CAMEL_ADDRESS (bcc_addr), text_addr);
 			}
@@ -923,7 +922,7 @@ e_msg_composer_hdrs_to_message_internal (EMsgComposerHdrs *hdrs,
 					 CamelMimeMessage *msg,
 					 gboolean redirect)
 {
-	EDestination **to_destv, **cc_destv, **bcc_destv;
+	EABDestination **to_destv, **cc_destv, **bcc_destv;
 	CamelInternetAddress *addr;
 	const char *subject;
 	char *header;
@@ -959,9 +958,9 @@ e_msg_composer_hdrs_to_message_internal (EMsgComposerHdrs *hdrs,
 		
 		set_recipients_from_destv (msg, to_destv, cc_destv, bcc_destv, redirect);
 		
-		e_destination_freev (to_destv);
-		e_destination_freev (cc_destv);
-		e_destination_freev (bcc_destv);
+		eab_destination_freev (to_destv);
+		eab_destination_freev (cc_destv);
+		eab_destination_freev (bcc_destv);
 	}
 	
 	if (hdrs->visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO) {
@@ -1056,26 +1055,26 @@ e_msg_composer_hdrs_set_reply_to (EMsgComposerHdrs *hdrs,
 
 void
 e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
-			    EDestination **to_destv)
+			    EABDestination **to_destv)
 {
 	char *str;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
 	
-	str = e_destination_exportv (to_destv);
+	str = eab_destination_exportv (to_destv);
 	bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->to.entry), "destinations", TC_CORBA_string, str ? str : "", NULL); 
 	g_free (str);
 }
 
 void
 e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
-			    EDestination **cc_destv)
+			    EABDestination **cc_destv)
 {
 	char *str;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
 	
-	str = e_destination_exportv (cc_destv);
+	str = eab_destination_exportv (cc_destv);
 	bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->cc.entry), "destinations", TC_CORBA_string, str ? str :"", NULL);
 	if (str && *str)
 		set_pair_visibility (hdrs, &hdrs->priv->cc, TRUE);
@@ -1084,13 +1083,13 @@ e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
 
 void
 e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
-			     EDestination **bcc_destv)
+			     EABDestination **bcc_destv)
 {
 	char *str;
 	
 	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
 	
-	str = e_destination_exportv (bcc_destv);
+	str = eab_destination_exportv (bcc_destv);
 	bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->bcc.entry), "destinations", TC_CORBA_string, str ? str : "", NULL); 
 	if (str && *str)
 		set_pair_visibility (hdrs, &hdrs->priv->bcc, TRUE);
@@ -1159,67 +1158,67 @@ e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs)
 	return addr;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)
 {
 	char *str = NULL;
-	EDestination **destv = NULL;
+	EABDestination **destv = NULL;
 	
 	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
 	
 	bonobo_widget_get_property (BONOBO_WIDGET (hdrs->priv->to.entry), "destinations", TC_CORBA_string, &str, NULL); 
 	
 	if (str != NULL) {
-		destv = e_destination_importv (str);
+		destv = eab_destination_importv (str);
 		g_free (str);
 	}
 	
 	return destv;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)
 {
 	char *str = NULL;
-	EDestination **destv = NULL;
+	EABDestination **destv = NULL;
 	
 	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
 	
 	bonobo_widget_get_property (BONOBO_WIDGET (hdrs->priv->cc.entry), "destinations", TC_CORBA_string, &str, NULL); 
 	
 	if (str != NULL) {
-		destv = e_destination_importv (str);
+		destv = eab_destination_importv (str);
 		g_free (str);
 	}
 	
 	return destv;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)
 {
 	char *str = NULL;
-	EDestination **destv = NULL;
+	EABDestination **destv = NULL;
 	
 	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
 	
 	bonobo_widget_get_property (BONOBO_WIDGET (hdrs->priv->bcc.entry), "destinations", TC_CORBA_string, &str, NULL); 
 	
 	if (str != NULL) {
-		destv = e_destination_importv (str);
+		destv = eab_destination_importv (str);
 		g_free (str);
 	}
 	
 	return destv;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
 {
-	EDestination **to_destv;
-	EDestination **cc_destv;
-	EDestination **bcc_destv;
-	EDestination **recip_destv;
+	EABDestination **to_destv;
+	EABDestination **cc_destv;
+	EABDestination **bcc_destv;
+	EABDestination **recip_destv;
 	int i, j, n;
 	
 	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
@@ -1237,7 +1236,7 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
 	if (n == 0)
 		return NULL;
 	
-	recip_destv = g_new (EDestination *, n + 1);
+	recip_destv = g_new (EABDestination *, n + 1);
 	
 	j = 0;
 	
diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
index eae32c6ef6..ff39062f19 100644
--- a/composer/e-msg-composer-hdrs.h
+++ b/composer/e-msg-composer-hdrs.h
@@ -31,7 +31,7 @@
 
 #include <e-util/e-account.h>
 #include <camel/camel-mime-message.h>
-#include <addressbook/backend/ebook/e-destination.h>
+#include <addressbook/util/eab-destination.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -110,11 +110,11 @@ void        e_msg_composer_hdrs_set_from_account   (EMsgComposerHdrs *hdrs,
 void        e_msg_composer_hdrs_set_reply_to       (EMsgComposerHdrs *hdrs,
 						    const char *reply_to);
 void        e_msg_composer_hdrs_set_to             (EMsgComposerHdrs *hdrs,
-						    EDestination    **to_destv);
+						    EABDestination    **to_destv);
 void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,
-						    EDestination    **cc_destv);
+						    EABDestination    **cc_destv);
 void        e_msg_composer_hdrs_set_bcc            (EMsgComposerHdrs *hdrs,
-						    EDestination    **bcc_destv);
+						    EABDestination    **bcc_destv);
 void        e_msg_composer_hdrs_set_post_to        (EMsgComposerHdrs *hdrs,
 						    const char       *post_to);
 void        e_msg_composer_hdrs_set_subject        (EMsgComposerHdrs *hdrs,
@@ -123,10 +123,10 @@ void        e_msg_composer_hdrs_set_subject        (EMsgComposerHdrs *hdrs,
 CamelInternetAddress *e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs);
 CamelInternetAddress *e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs);
 
-EDestination **e_msg_composer_hdrs_get_to          (EMsgComposerHdrs *hdrs);
-EDestination **e_msg_composer_hdrs_get_cc          (EMsgComposerHdrs *hdrs);
-EDestination **e_msg_composer_hdrs_get_bcc         (EMsgComposerHdrs *hdrs);
-EDestination **e_msg_composer_hdrs_get_recipients  (EMsgComposerHdrs *hdrs);
+EABDestination **e_msg_composer_hdrs_get_to         (EMsgComposerHdrs *hdrs);
+EABDestination **e_msg_composer_hdrs_get_cc         (EMsgComposerHdrs *hdrs);
+EABDestination **e_msg_composer_hdrs_get_bcc        (EMsgComposerHdrs *hdrs);
+EABDestination **e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs);
 char          *e_msg_composer_hdrs_get_post_to     (EMsgComposerHdrs *hdrs);
 const char    *e_msg_composer_hdrs_get_subject     (EMsgComposerHdrs *hdrs);
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index f446229889..d4b06cb2b7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2294,7 +2294,7 @@ enum {
 static void
 update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs)
 {
-	EDestination *dest, **destv = NULL;
+	EABDestination *dest, **destv = NULL;
 	CamelInternetAddress *iaddr;
 	GList *list, *tail, *node;
 	int i, n = 0;
@@ -2310,14 +2310,14 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
 				if (!camel_internet_address_get (iaddr, i, &name, &addr))
 					continue;
 				
-				dest = e_destination_new ();
-				e_destination_set_auto_recipient (dest, TRUE);
+				dest = eab_destination_new ();
+				eab_destination_set_auto_recipient (dest, TRUE);
 				
 				if (name)
-					e_destination_set_name (dest, name);
+					eab_destination_set_name (dest, name);
 				
 				if (addr)
-					e_destination_set_email (dest, addr);
+					eab_destination_set_email (dest, addr);
 				
 				node = g_list_alloc ();
 				node->data = dest;
@@ -2352,9 +2352,9 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
 	
 	if (destv) {
 		for (i = 0; destv[i]; i++) {
-			if (!e_destination_is_auto_recipient (destv[i])) {
+			if (!eab_destination_is_auto_recipient (destv[i])) {
 				node = g_list_alloc ();
-				node->data = e_destination_copy (destv[i]);
+				node->data = eab_destination_copy (destv[i]);
 				node->next = NULL;
 				
 				if (tail) {
@@ -2370,10 +2370,10 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
 			}
 		}
 		
-		e_destination_freev (destv);
+		eab_destination_freev (destv);
 	}
 	
-	destv = e_destination_list_to_vector_sized (list, n);
+	destv = eab_destination_list_to_vector_sized (list, n);
 	g_list_free (list);
 	
 	switch (mode) {
@@ -2387,7 +2387,7 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
 		g_assert_not_reached ();
 	}
 	
-	e_destination_freev (destv);
+	eab_destination_freev (destv);
 }
 
 static void
@@ -3580,7 +3580,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	const CamelInternetAddress *to, *cc, *bcc;
 	GList *To = NULL, *Cc = NULL, *Bcc = NULL;
 	const char *format, *subject, *postto;
-	EDestination **Tov, **Ccv, **Bccv;
+	EABDestination **Tov, **Ccv, **Bccv;
 	GHashTable *auto_cc, *auto_bcc;
 	CamelContentType *content_type;
 	struct _camel_header_raw *headers;
@@ -3657,13 +3657,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 			const char *name, *addr;
 			
 			if (camel_internet_address_get (to, i, &name, &addr)) {
-				EDestination *dest = e_destination_new ();
-				e_destination_set_name (dest, name);
-				e_destination_set_email (dest, addr);
+				EABDestination *dest = eab_destination_new ();
+				eab_destination_set_name (dest, name);
+				eab_destination_set_email (dest, addr);
 				To = g_list_append (To, dest);
 			}
 		}
-		Tov = e_destination_list_to_vector (To);
+		Tov = eab_destination_list_to_vector (To);
 		g_list_free (To);
 		
 		len = CAMEL_ADDRESS (cc)->addresses->len;
@@ -3671,18 +3671,18 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 			const char *name, *addr;
 			
 			if (camel_internet_address_get (cc, i, &name, &addr)) {
-				EDestination *dest = e_destination_new ();
-				e_destination_set_name (dest, name);
-				e_destination_set_email (dest, addr);
+				EABDestination *dest = eab_destination_new ();
+				eab_destination_set_name (dest, name);
+				eab_destination_set_email (dest, addr);
 				
 				if (g_hash_table_lookup (auto_cc, addr))
-					e_destination_set_auto_recipient (dest, TRUE);
+					eab_destination_set_auto_recipient (dest, TRUE);
 				
 				Cc = g_list_append (Cc, dest);
 			}
 		}
 		
-		Ccv = e_destination_list_to_vector (Cc);
+		Ccv = eab_destination_list_to_vector (Cc);
 		g_hash_table_foreach (auto_cc, auto_recip_free, NULL);
 		g_hash_table_destroy (auto_cc);
 		g_list_free (Cc);
@@ -3692,18 +3692,18 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 			const char *name, *addr;
 			
 			if (camel_internet_address_get (bcc, i, &name, &addr)) {
-				EDestination *dest = e_destination_new ();
-				e_destination_set_name (dest, name);
-				e_destination_set_email (dest, addr);
+				EABDestination *dest = eab_destination_new ();
+				eab_destination_set_name (dest, name);
+				eab_destination_set_email (dest, addr);
 				
 				if (g_hash_table_lookup (auto_bcc, addr))
-					e_destination_set_auto_recipient (dest, TRUE);
+					eab_destination_set_auto_recipient (dest, TRUE);
 				
 				Bcc = g_list_append (Bcc, dest);
 			}
 		}
 		
-		Bccv = e_destination_list_to_vector (Bcc);
+		Bccv = eab_destination_list_to_vector (Bcc);
 		g_hash_table_foreach (auto_bcc, auto_recip_free, NULL);
 		g_hash_table_destroy (auto_bcc);
 		g_list_free (Bcc);
@@ -3719,9 +3719,9 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	
 	g_free (account_name);
 	
-	e_destination_freev (Tov);
-	e_destination_freev (Ccv);
-	e_destination_freev (Bccv);
+	eab_destination_freev (Tov);
+	eab_destination_freev (Ccv);
+	eab_destination_freev (Bccv);
 	
 	/* Restore the format editing preference */
 	format = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format");
@@ -3843,9 +3843,9 @@ add_recipients (GList *list, const char *recips, gboolean decode)
 	
 	for (i = 0; i < num; i++) {
 		if (camel_internet_address_get (cia, i, &name, &addr)) {
-			EDestination *dest = e_destination_new ();
-			e_destination_set_name (dest, name);
-			e_destination_set_email (dest, addr);
+			EABDestination *dest = eab_destination_new ();
+			eab_destination_set_name (dest, name);
+			eab_destination_set_email (dest, addr);
 			
 			list = g_list_append (list, dest);
 		}
@@ -3859,7 +3859,7 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
 {
 	EMsgComposerHdrs *hdrs;
 	GList *to = NULL, *cc = NULL, *bcc = NULL;
-	EDestination **tov, **ccv, **bccv;
+	EABDestination **tov, **ccv, **bccv;
 	char *subject = NULL, *body = NULL;
 	char *header, *content, *buf;
 	size_t nread, nwritten;
@@ -3964,9 +3964,9 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
 	
 	g_free (buf);
 	
-	tov  = e_destination_list_to_vector (to);
-	ccv  = e_destination_list_to_vector (cc);
-	bccv = e_destination_list_to_vector (bcc);
+	tov  = eab_destination_list_to_vector (to);
+	ccv  = eab_destination_list_to_vector (cc);
+	bccv = eab_destination_list_to_vector (bcc);
 	
 	g_list_free (to);
 	g_list_free (cc);
@@ -3978,9 +3978,9 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
 	e_msg_composer_hdrs_set_cc (hdrs, ccv);
 	e_msg_composer_hdrs_set_bcc (hdrs, bccv);
 	
-	e_destination_freev (tov);
-	e_destination_freev (ccv);
-	e_destination_freev (bccv);
+	eab_destination_freev (tov);
+	eab_destination_freev (ccv);
+	eab_destination_freev (bccv);
 	
 	if (subject) {
 		e_msg_composer_hdrs_set_subject (hdrs, subject);
@@ -4053,9 +4053,9 @@ e_msg_composer_show_attachments (EMsgComposer *composer,
 void 
 e_msg_composer_set_headers (EMsgComposer *composer,
 			    const char *from,
-			    EDestination **to,
-			    EDestination **cc,
-			    EDestination **bcc,
+			    EABDestination **to,
+			    EABDestination **cc,
+			    EABDestination **bcc,
 			    const char *subject)
 {
 	EMsgComposerHdrs *hdrs;
@@ -4829,7 +4829,7 @@ e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)
 }
 
 
-EDestination **
+EABDestination **
 e_msg_composer_get_recipients (EMsgComposer *composer)
 {
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
@@ -4837,7 +4837,7 @@ e_msg_composer_get_recipients (EMsgComposer *composer)
 	return composer->hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_get_to (EMsgComposer *composer)
 {
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
@@ -4845,7 +4845,7 @@ e_msg_composer_get_to (EMsgComposer *composer)
 	return composer->hdrs ? e_msg_composer_hdrs_get_to (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_get_cc (EMsgComposer *composer)
 {
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
@@ -4853,7 +4853,7 @@ e_msg_composer_get_cc (EMsgComposer *composer)
 	return composer->hdrs ? e_msg_composer_hdrs_get_cc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
 }
 
-EDestination **
+EABDestination **
 e_msg_composer_get_bcc (EMsgComposer *composer)
 {
 	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index e28d8981d5..734b4c8760 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -134,9 +134,9 @@ void                     e_msg_composer_show_attachments                 (EMsgCo
 									  gboolean           show);
 void                     e_msg_composer_set_headers                      (EMsgComposer      *composer,
 									  const char        *from,
-									  EDestination     **to,
-									  EDestination     **cc,
-									  EDestination     **bcc,
+									  EABDestination     **to,
+									  EABDestination     **cc,
+									  EABDestination     **bcc,
 									  const char        *subject);
 void                     e_msg_composer_set_body_text                    (EMsgComposer      *composer,
 									  const char        *text);
@@ -173,10 +173,10 @@ gboolean                 e_msg_composer_get_view_bcc                     (EMsgCo
 void                     e_msg_composer_set_view_bcc                     (EMsgComposer      *composer,
 									  gboolean           view_bcc);
 
-EDestination           **e_msg_composer_get_recipients                   (EMsgComposer *composer);
-EDestination           **e_msg_composer_get_to                           (EMsgComposer *composer);
-EDestination           **e_msg_composer_get_cc                           (EMsgComposer *composer);
-EDestination           **e_msg_composer_get_bcc                          (EMsgComposer *composer);
+EABDestination         **e_msg_composer_get_recipients                   (EMsgComposer *composer);
+EABDestination         **e_msg_composer_get_to                           (EMsgComposer *composer);
+EABDestination         **e_msg_composer_get_cc                           (EMsgComposer *composer);
+EABDestination         **e_msg_composer_get_bcc                          (EMsgComposer *composer);
 const char              *e_msg_composer_get_subject                      (EMsgComposer *composer);
 
 EAccount                *e_msg_composer_get_preferred_account            (EMsgComposer      *composer);
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index b5c7630de8..31da13c342 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -47,26 +47,26 @@ struct _EvolutionComposerPrivate {
 };
 
 /* CORBA interface implementation.  */
-static EDestination **
+static EABDestination **
 corba_recipientlist_to_destv (const GNOME_Evolution_Composer_RecipientList *cl)
 {
 	GNOME_Evolution_Composer_Recipient *recip;
-	EDestination **destv;
+	EABDestination **destv;
 	int i;
 
 	if (cl->_length == 0)
 		return NULL;
 
-	destv = g_new (EDestination *, cl->_length+1);
+	destv = g_new (EABDestination *, cl->_length+1);
 
 	for (i = 0; i < cl->_length; ++i) {
 		recip = &(cl->_buffer[i]);
 
-		destv[i] = e_destination_new ();
+		destv[i] = eab_destination_new ();
 
 		if (*recip->name)
-			e_destination_set_name (destv[i], recip->name);
-		e_destination_set_email (destv[i], recip->address);
+			eab_destination_set_name (destv[i], recip->name);
+		eab_destination_set_email (destv[i], recip->address);
 		
 	}
 	destv[cl->_length] = NULL;
@@ -85,7 +85,7 @@ impl_Composer_set_headers (PortableServer_Servant servant,
 {
 	BonoboObject *bonobo_object;
 	EvolutionComposer *composer;
-	EDestination **tov, **ccv, **bccv;
+	EABDestination **tov, **ccv, **bccv;
 	EAccountList *accounts;
 	EAccount *account;
 	EIterator *iter;
@@ -122,9 +122,9 @@ impl_Composer_set_headers (PortableServer_Servant servant,
 	e_msg_composer_set_headers (composer->composer, account->name,
 				    tov, ccv, bccv, subject);
 	
-	e_destination_freev (tov);
-	e_destination_freev (ccv);
-	e_destination_freev (bccv);
+	eab_destination_freev (tov);
+	eab_destination_freev (ccv);
+	eab_destination_freev (bccv);
 }
 
 static void