diff options
Diffstat (limited to 'mail/em-composer-utils.c')
| -rw-r--r-- | mail/em-composer-utils.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index e181c2cb33..75166a19b4 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -101,7 +101,7 @@ composer_destroy_cb (gpointer user_data, GObject *deadbeef) } static gboolean -ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recipients) +ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EABDestination **recipients) { gboolean show_again, res; GConfClient *gconf; @@ -117,10 +117,10 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip str = g_string_new (_("You are sending an HTML-formatted message. Please make sure that\n" "the following recipients are willing and able to receive HTML mail:\n")); for (i = 0; recipients[i] != NULL; ++i) { - if (!e_destination_get_html_mail_pref (recipients[i])) { + if (!eab_destination_get_html_mail_pref (recipients[i])) { const char *name; - name = e_destination_get_textrep (recipients[i], FALSE); + name = eab_destination_get_textrep (recipients[i], FALSE); g_string_append_printf (str, " %s\n", name); } @@ -262,7 +262,7 @@ static CamelMimeMessage * composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_object_data) { CamelMimeMessage *message = NULL; - EDestination **recipients, **recipients_bcc; + EABDestination **recipients, **recipients_bcc; gboolean send_html, confirm_html; CamelInternetAddress *cia; int hidden = 0, shown = 0; @@ -286,15 +286,15 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_ /* see which ones are visible/present, etc */ if (recipients) { for (i = 0; recipients[i] != NULL; i++) { - const char *addr = e_destination_get_address (recipients[i]); + const char *addr = eab_destination_get_address (recipients[i]); if (addr && addr[0]) { camel_address_decode ((CamelAddress *) cia, addr); if (camel_address_length ((CamelAddress *) cia) > 0) { camel_address_remove ((CamelAddress *) cia, -1); num++; - if (e_destination_is_evolution_list (recipients[i]) - && !e_destination_list_show_addresses (recipients[i])) { + if (eab_destination_is_evolution_list (recipients[i]) + && !eab_destination_list_show_addresses (recipients[i])) { hidden++; } else { shown++; @@ -307,7 +307,7 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_ recipients_bcc = e_msg_composer_get_bcc (composer); if (recipients_bcc) { for (i = 0; recipients_bcc[i] != NULL; i++) { - const char *addr = e_destination_get_address (recipients_bcc[i]); + const char *addr = eab_destination_get_address (recipients_bcc[i]); if (addr && addr[0]) { camel_address_decode ((CamelAddress *) cia, addr); @@ -318,7 +318,7 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_ } } - e_destination_freev (recipients_bcc); + eab_destination_freev (recipients_bcc); } camel_object_unref (cia); @@ -347,7 +347,7 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_ if (recipients) { for (i = 0; recipients[i] != NULL && !html_problem; i++) { - if (!e_destination_get_html_mail_pref (recipients[i])) + if (!eab_destination_get_html_mail_pref (recipients[i])) html_problem = TRUE; } } @@ -384,12 +384,12 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_ /* Get the message recipients and 'touch' them, boosting their use scores */ if (recipients) - e_destination_touchv (recipients); + eab_destination_touchv (recipients); finished: if (recipients) - e_destination_freev (recipients); + eab_destination_freev (recipients); return message; } |