1
From a9d0d64ab9aa61855fce0537b90fc05924bc3d85 Mon Sep 17 00:00:00 2001
2
From: Matthew Barnes <mbarnes@redhat.com>
3
Date: Mon, 21 Jun 2010 11:28:22 +0000
4
Subject: Revert "Bug 619347 - Return formatted address in e_destination_get_address"
6
This reverts commit db8c986c4f06f0cb57de9bfa6982b4e78f0bb32a.
8
Despite the misleading documentation, e_destination_get_address() -is-
9
intended to return an encoded address suitable for use in mail headers.
10
e_destination_get_textrep() exists for displaying destination addresses
11
to the user. The Contact List Editor is apparently calling the wrong
14
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
15
index 00b7e76..6ed9870 100644
16
--- a/addressbook/libebook/e-destination.c
17
+++ b/addressbook/libebook/e-destination.c
18
@@ -881,11 +881,11 @@ e_destination_get_address (const EDestination *dest)
19
iter = g_list_next (iter);
22
- priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
23
+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
24
} else if (priv->raw) {
26
if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
27
- priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
28
+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
31
const gchar *name, *email;
32
@@ -900,7 +900,7 @@ e_destination_get_address (const EDestination *dest)
33
nothing we can do here */
34
camel_address_decode (CAMEL_ADDRESS (addr), name);
36
- priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
37
+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
40
camel_object_unref (CAMEL_OBJECT (addr));