[evolution-data-server/gnome-2-30] Bug 619347 - Return formatted address in e_destination_get_address

[Matthew Barnes <mbarnes src gnome org>]

commit 26f8a8a067634837816e01bb6bfc283f3a953453
Author: David Ayers <ayers fsfe org>
Date:   Thu May 20 18:04:57 2010 +0200

    Bug 619347 - Return formatted address in e_destination_get_address
    
    The documentation of this method claims to return the formatted name
    yet it previously encoded them in quotable strings.  This patch fixes
    this which results in strings containing non ASCII chracters to be
    rendered correctly in the UI.  This also changes the vCard output but
    vCard 3.0 specifies that quotable-printable inline ecnodings have been
    eliminated.  In any case this quoting should be handled in
    e_destination_export_to_vcard_attribute instead.

 addressbook/libebook/e-destination.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 6ed9870..00b7e76 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -881,11 +881,11 @@ e_destination_get_address (const EDestination *dest)
 				iter = g_list_next (iter);
 			}
 
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+			priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
 		} else if (priv->raw) {
 
 			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+				priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
 			}
 		} else {
 			const gchar *name, *email;
@@ -900,7 +900,7 @@ e_destination_get_address (const EDestination *dest)
 				nothing we can do here */
 				camel_address_decode (CAMEL_ADDRESS (addr), name);
 
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+			priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
 		}
 
 		camel_object_unref (CAMEL_OBJECT (addr));