From 16b7fae670745f3dc7b8858e50dc08f7778f5b09 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 9 Apr 2004 17:30:58 +0000 Subject: use e_destination_export_to_vcard_attribute instead of exporting to xml, 2004-04-09 Chris Toshok * importers/pine-importer.c (import_contact): use e_destination_export_to_vcard_attribute instead of exporting to xml, and use e_contact_set_attributes. * em-utils.c (em_utils_camel_address_to_destination): EABDestination -> EDestination. (reply_get_composer): same (post_reply_to_message): same. * em-composer-utils.c (ask_confirm_for_unwanted_html_mail): EABDestination -> EDestination. (composer_get_message): same. svn path=/trunk/; revision=25392 --- mail/em-utils.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mail/em-utils.c') diff --git a/mail/em-utils.c b/mail/em-utils.c index 7a553ad68c..60d2bd659b 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -799,10 +799,10 @@ generate_account_hash (void) return account_hash; } -static EABDestination ** +static EDestination ** em_utils_camel_address_to_destination (CamelInternetAddress *iaddr) { - EABDestination *dest, **destv; + EDestination *dest, **destv; int n, i, j; if (iaddr == NULL) @@ -811,14 +811,14 @@ em_utils_camel_address_to_destination (CamelInternetAddress *iaddr) if ((n = camel_address_length ((CamelAddress *) iaddr)) == 0) return NULL; - destv = g_malloc (sizeof (EABDestination *) * (n + 1)); + destv = g_malloc (sizeof (EDestination *) * (n + 1)); for (i = 0, j = 0; i < n; i++) { const char *name, *addr; if (camel_internet_address_get (iaddr, i, &name, &addr)) { - dest = eab_destination_new (); - eab_destination_set_name (dest, name); - eab_destination_set_email (dest, addr); + dest = e_destination_new (); + e_destination_set_name (dest, name); + e_destination_set_email (dest, addr); destv[j++] = dest; } @@ -840,7 +840,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, CamelFolder *folder, const char *postto) { const char *message_id, *references; - EABDestination **tov, **ccv; + EDestination **tov, **ccv; EMsgComposer *composer; char *subject; @@ -1281,7 +1281,7 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m /* FIXME: would be nice if this shared more code with reply_get_composer() */ const char *message_id, *references; CamelInternetAddress *to = NULL; - EABDestination **tov = NULL; + EDestination **tov = NULL; EMsgComposer *composer; char *subject, *url; EAccount *account; -- cgit