[balsa/gmime3: 35/72] Insert a NULL format-options argument
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gmime3: 35/72] Insert a NULL format-options argument
- Date: Sun, 19 Jan 2020 16:00:51 +0000 (UTC)
commit a273517d616b8f0e411851046b6556e517d1bad9
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Thu Nov 21 09:54:29 2019 -0800
Insert a NULL format-options argument
to calls to internet_address_list_to_string()
modified: libbalsa/filter.c
modified: libbalsa/mailbox_local.c
modified: libbalsa/mailbox_mbox.c
modified: libbalsa/send.c
modified: src/balsa-message.c
modified: src/balsa-mime-widget-message.c
modified: src/balsa-print-object-header.c
modified: src/message-window.c
modified: src/print-gtk.c
modified: src/sendmsg-window.c
libbalsa/filter.c | 6 +++---
libbalsa/mailbox_local.c | 6 +++---
libbalsa/mailbox_mbox.c | 2 +-
libbalsa/send.c | 6 +++---
src/balsa-message.c | 6 +++---
src/balsa-mime-widget-message.c | 8 ++++----
src/balsa-print-object-header.c | 2 +-
src/message-window.c | 2 +-
src/print-gtk.c | 2 +-
src/sendmsg-window.c | 12 ++++++------
10 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/libbalsa/filter.c b/libbalsa/filter.c
index e85d36e09..02f60c55a 100644
--- a/libbalsa/filter.c
+++ b/libbalsa/filter.c
@@ -131,13 +131,13 @@ libbalsa_condition_matches(LibBalsaCondition* cond,
}
/* do the work */
if (CONDITION_CHKMATCH(cond,CONDITION_MATCH_TO) && headers->to_list != NULL) {
- str = internet_address_list_to_string(headers->to_list, FALSE);
+ str = internet_address_list_to_string(headers->to_list, NULL, FALSE);
match = libbalsa_utf8_strstr(str,cond->match.string.string);
g_free(str);
if(match) break;
}
if (CONDITION_CHKMATCH(cond,CONDITION_MATCH_FROM) && headers->from != NULL) {
- str = internet_address_list_to_string(headers->from, FALSE);
+ str = internet_address_list_to_string(headers->from, NULL, FALSE);
match=libbalsa_utf8_strstr(str,cond->match.string.string);
g_free(str);
if (match) break;
@@ -150,7 +150,7 @@ libbalsa_condition_matches(LibBalsaCondition* cond,
}
}
if (CONDITION_CHKMATCH(cond,CONDITION_MATCH_CC) && headers->cc_list != NULL) {
- str = internet_address_list_to_string(headers->cc_list, FALSE);
+ str = internet_address_list_to_string(headers->cc_list, NULL, FALSE);
match=libbalsa_utf8_strstr(str,cond->match.string.string);
g_free(str);
if (match) break;
diff --git a/libbalsa/mailbox_local.c b/libbalsa/mailbox_local.c
index 15306799d..d466dd551 100644
--- a/libbalsa/mailbox_local.c
+++ b/libbalsa/mailbox_local.c
@@ -875,7 +875,7 @@ message_match_real(LibBalsaMailbox *mailbox, guint msgno,
headers = libbalsa_message_get_headers(message);
if (headers->to_list != NULL) {
gchar *str =
- internet_address_list_to_string(headers->to_list, FALSE);
+ internet_address_list_to_string(headers->to_list, NULL, FALSE);
match =
libbalsa_utf8_strstr(str, cond->match.string.string);
g_free(str);
@@ -904,7 +904,7 @@ message_match_real(LibBalsaMailbox *mailbox, guint msgno,
headers = libbalsa_message_get_headers(message);
if (headers->cc_list != NULL) {
gchar *str =
- internet_address_list_to_string(headers->cc_list, FALSE);
+ internet_address_list_to_string(headers->cc_list, NULL, FALSE);
match =
libbalsa_utf8_strstr(str, cond->match.string.string);
g_free(str);
@@ -1036,7 +1036,7 @@ libbalsa_mailbox_local_cache_message(LibBalsaMailboxLocal * local,
info->sender = NULL;
headers = libbalsa_message_get_headers(message);
if (headers->from != NULL)
- info->sender = internet_address_list_to_string(headers->from, FALSE);
+ info->sender = internet_address_list_to_string(headers->from, NULL, FALSE);
if (info->sender == NULL)
info->sender = g_strdup("");
}
diff --git a/libbalsa/mailbox_mbox.c b/libbalsa/mailbox_mbox.c
index c75112861..23a16a828 100644
--- a/libbalsa/mailbox_mbox.c
+++ b/libbalsa/mailbox_mbox.c
@@ -1879,7 +1879,7 @@ lbm_mbox_add_message(LibBalsaMailboxLocal * local,
ctime_r(&(headers->date), date_string);
sender = headers->from != NULL ?
- internet_address_list_to_string(headers->from, FALSE) :
+ internet_address_list_to_string(headers->from, NULL, FALSE) :
g_strdup("none");
g_object_unref(message);
diff --git a/libbalsa/send.c b/libbalsa/send.c
index 901ea1146..88bf113fb 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1484,14 +1484,14 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
headers = libbalsa_message_get_headers(message);
if (headers->from != NULL) {
- tmp = internet_address_list_to_string(headers->from, TRUE);
+ tmp = internet_address_list_to_string(headers->from, NULL, TRUE);
if (tmp != NULL) {
g_mime_message_set_sender(mime_message, tmp);
g_free(tmp);
}
}
if (headers->reply_to != NULL) {
- tmp = internet_address_list_to_string(headers->reply_to, TRUE);
+ tmp = internet_address_list_to_string(headers->reply_to, NULL, TRUE);
if (tmp != NULL) {
g_mime_message_set_reply_to(mime_message, tmp);
g_free(tmp);
@@ -1527,7 +1527,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
}
if (headers->dispnotify_to != NULL) {
- tmp = internet_address_list_to_string(headers->dispnotify_to, TRUE);
+ tmp = internet_address_list_to_string(headers->dispnotify_to, NULL, TRUE);
if (tmp != NULL) {
g_mime_object_append_header(GMIME_OBJECT(mime_message),
"Disposition-Notification-To", tmp);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 0c2052eae..4256313e3 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -1082,7 +1082,7 @@ balsa_message_sender_to_gchar(InternetAddressList * list, gint which)
if (!list)
return g_strdup(_("(No sender)"));
if (which < 0)
- return internet_address_list_to_string(list, FALSE);
+ return internet_address_list_to_string(list, NULL, FALSE);
ia = internet_address_list_get_address (list, which);
return internet_address_to_string(ia, NULL, FALSE);
}
@@ -2466,7 +2466,7 @@ handle_mdn_request(GtkWindow *parent,
gchar *reply_to;
sender = from ? internet_address_to_string(from, NULL, FALSE) : NULL;
reply_to =
- internet_address_list_to_string (headers->dispnotify_to,
+ internet_address_list_to_string (headers->dispnotify_to, NULL,
FALSE);
gtk_widget_show_all (create_mdn_dialog (parent, sender, reply_to, mdn,
mdn_ident));
@@ -2528,7 +2528,7 @@ static LibBalsaMessage *create_mdn_reply (const LibBalsaIdentity *mdn_ident,
/* the first part of the body is an informational note */
body = libbalsa_message_body_new(message);
date = libbalsa_message_date_to_utf8(for_msg, balsa_app.date_string);
- dummy = internet_address_list_to_string(for_msg_headers->to_list, FALSE);
+ dummy = internet_address_list_to_string(for_msg_headers->to_list, NULL, FALSE);
body->buffer = g_strdup_printf(
"The message sent on %s to %s with subject ā%sā has been displayed.\n"
"There is no guarantee that the message has been read or understood.\n\n",
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 9e79549a3..1da0da2dd 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -687,7 +687,7 @@ add_header_address_list(BalsaMessage * bm, GtkGrid * grid,
libbalsa_find_word(header, balsa_app.selected_headers)))
return;
- value = internet_address_list_to_string(list, FALSE);
+ value = internet_address_list_to_string(list, NULL, FALSE);
add_header_gchar(grid, header, label, value, show_all_headers);
@@ -751,14 +751,14 @@ bmw_message_set_headers_d(BalsaMessage * bm,
if (headers->from) {
gchar *from =
- internet_address_list_to_string(headers->from, FALSE);
+ internet_address_list_to_string(headers->from, NULL, FALSE);
add_header_gchar(grid, "from", _("From:"), from, show_all_headers);
g_free(from);
}
if (headers->reply_to) {
gchar *reply_to =
- internet_address_list_to_string(headers->reply_to, FALSE);
+ internet_address_list_to_string(headers->reply_to, NULL, FALSE);
add_header_gchar(grid, "reply-to", _("Reply-To:"), reply_to,
show_all_headers);
g_free(reply_to);
@@ -778,7 +778,7 @@ bmw_message_set_headers_d(BalsaMessage * bm,
if (headers->dispnotify_to) {
gchar *mdn_to =
- internet_address_list_to_string(headers->dispnotify_to, FALSE);
+ internet_address_list_to_string(headers->dispnotify_to, NULL, FALSE);
add_header_gchar(grid, "disposition-notification-to",
_("Disposition-Notification-To:"), mdn_to,
show_all_headers);
diff --git a/src/balsa-print-object-header.c b/src/balsa-print-object-header.c
index 955647266..c94b3411e 100644
--- a/src/balsa-print-object-header.c
+++ b/src/balsa-print-object-header.c
@@ -492,7 +492,7 @@ header_add_list(PangoLayout * layout, GString * header_buf,
balsa_app.shown_headers == HEADERS_ALL ||
libbalsa_find_word(field_id, balsa_app.selected_headers)) ||
!values ||
- !(_value = internet_address_list_to_string(values, FALSE)))
+ !(_value = internet_address_list_to_string(values, NULL, FALSE)))
return;
p_width = p_string_width_from_layout(layout, label);
diff --git a/src/message-window.c b/src/message-window.c
index e93110d2b..52682b940 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -735,7 +735,7 @@ mw_select_part_cb(BalsaMessage * bm, gpointer data)
LibBalsaMessage *message = balsa_message_get_message(bm);
if (message != NULL) {
- from = internet_address_list_to_string(libbalsa_message_get_headers(message)->from,
+ from = internet_address_list_to_string(libbalsa_message_get_headers(message)->from, NULL,
FALSE);
title = g_strdup_printf(_("Message from %s: %s"), from,
LIBBALSA_MESSAGE_GET_SUBJECT(message));
diff --git a/src/print-gtk.c b/src/print-gtk.c
index d2ca1754a..93bad5285 100644
--- a/src/print-gtk.c
+++ b/src/print-gtk.c
@@ -348,7 +348,7 @@ begin_print(GtkPrintOperation * operation, GtkPrintContext * context,
from_list = libbalsa_message_get_headers(pdata->message)->from;
if (from_list != NULL) {
- gchar *from = internet_address_list_to_string(from_list, FALSE);
+ gchar *from = internet_address_list_to_string(from_list, NULL, FALSE);
libbalsa_utf8_sanitize(&from, balsa_app.convert_unknown_8bit,
NULL);
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 4a2abad6f..e1817ab20 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -814,7 +814,7 @@ sw_edit_activated(GSimpleAction * action,
InternetAddressList *list =
libbalsa_address_view_get_list(bsmsg->recipient_view,
address_types[type]);
- gchar *addr_string = internet_address_list_to_string(list, FALSE);
+ gchar *addr_string = internet_address_list_to_string(list, NULL, FALSE);
g_object_unref(list);
fprintf(tmp, "%s %s\n", _(address_types[type]), addr_string);
g_free(addr_string);
@@ -1733,7 +1733,7 @@ add_attachment(BalsaSendmsg * bsmsg, const gchar *filename,
utf8name = g_strdup(_("forwarded message"));
else {
gchar *tmp =
- internet_address_list_to_string(attach_data->headers->from,
+ internet_address_list_to_string(attach_data->headers->from, NULL,
FALSE);
utf8name = g_strdup_printf(_("Message from %s, subject: ā%sā"),
tmp,
@@ -3601,7 +3601,7 @@ quote_body(BalsaSendmsg * bsmsg, LibBalsaMessageHeaders *headers,
if (headers->from) {
gchar *from =
- internet_address_list_to_string(headers->from,
+ internet_address_list_to_string(headers->from, NULL,
FALSE);
g_string_append_printf(body, "%s %s\n", _("From:"), from);
g_free(from);
@@ -3609,7 +3609,7 @@ quote_body(BalsaSendmsg * bsmsg, LibBalsaMessageHeaders *headers,
if (internet_address_list_length(headers->to_list) > 0) {
gchar *to_list =
- internet_address_list_to_string(headers->to_list,
+ internet_address_list_to_string(headers->to_list, NULL,
FALSE);
g_string_append_printf(body, "%s %s\n", _("To:"), to_list);
g_free(to_list);
@@ -3617,7 +3617,7 @@ quote_body(BalsaSendmsg * bsmsg, LibBalsaMessageHeaders *headers,
if (internet_address_list_length(headers->cc_list) > 0) {
gchar *cc_list =
- internet_address_list_to_string(headers->cc_list,
+ internet_address_list_to_string(headers->cc_list, NULL,
FALSE);
g_string_append_printf(body, "%s %s\n", _("CC:"), cc_list);
g_free(cc_list);
@@ -6672,7 +6672,7 @@ sendmsg_window_set_title(BalsaSendmsg * bsmsg)
}
list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
- to_string = internet_address_list_to_string(list, FALSE);
+ to_string = internet_address_list_to_string(list, NULL, FALSE);
g_object_unref(list);
title = g_strdup_printf(title_format, to_string ? to_string : "",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]