Merge new-ui-branch into the trunk.

svn path=/trunk/; revision=22966

1 files changed, 35 insertions, 36 deletions

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;