[balsa] Adapt to new recipient strings
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Adapt to new recipient strings
- Date: Wed, 23 Nov 2016 04:10:18 +0000 (UTC)
commit 8f664c02f24dd41dccadac4aa4a1536307ea05ad
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Nov 22 23:09:50 2016 -0500
Adapt to new recipient strings
* src/sendmsg-window.c (update_bsmsg_identity),
(setup_headers_from_message), (setup_headers_from_identity),
(set_cc_from_all_recipients), (sendmsg_window_set_field),
(bsmsg2message), (check_suggest_encryption):
ChangeLog | 9 +++++++++
src/sendmsg-window.c | 24 ++++++++++++------------
2 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2c445e5..f7852a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-11-22 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Adapt to new recipient strings
+
+ * src/sendmsg-window.c (update_bsmsg_identity),
+ (setup_headers_from_message), (setup_headers_from_identity),
+ (set_cc_from_all_recipients), (sendmsg_window_set_field),
+ (bsmsg2message), (check_suggest_encryption):
+
2016-11-21 Peter Bloomfield <pbloomfield bellsouth net>
Save the correct window geometry
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index e6ada93..80711a4 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1117,7 +1117,7 @@ update_bsmsg_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity* ident)
InternetAddressList *bcc_list, *ident_list;
bcc_list =
- libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:");
+ libbalsa_address_view_get_list(bsmsg->recipient_view, "BCC:");
ident_list = internet_address_list_parse_string(bsmsg->ident->bcc);
if (ident_list) {
@@ -1155,7 +1155,7 @@ update_bsmsg_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity* ident)
}
/* Set the resulting list: */
- libbalsa_address_view_set_from_list(bsmsg->recipient_view, "Bcc:",
+ libbalsa_address_view_set_from_list(bsmsg->recipient_view, "BCC:",
bcc_list);
g_object_unref(bcc_list);
}
@@ -3864,13 +3864,13 @@ setup_headers_from_message(BalsaSendmsg* bsmsg, LibBalsaMessage *message)
* Note that if set-from-list is given an empty list, the blank line
* will be a To: line */
libbalsa_address_view_set_from_list(bsmsg->recipient_view,
- "Bcc:",
+ "BCC:",
message->headers->bcc_list);
libbalsa_address_view_set_from_list(bsmsg->recipient_view,
"To:",
message->headers->to_list);
libbalsa_address_view_set_from_list(bsmsg->recipient_view,
- "Cc:",
+ "CC:",
message->headers->cc_list);
}
@@ -3982,7 +3982,7 @@ setup_headers_from_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity *ident)
ident->replyto);
if(ident->bcc)
libbalsa_address_view_set_from_string(bsmsg->recipient_view,
- "Bcc:",
+ "BCC:",
ident->bcc);
/* Make sure the blank line is "To:" */
@@ -4292,7 +4292,7 @@ set_cc_from_all_recipients(BalsaSendmsg* bsmsg,
sw_cc_add_list(&new_cc, headers->cc_list);
libbalsa_address_view_set_from_list(bsmsg->recipient_view,
- "Cc:",
+ "CC:",
new_cc);
if (new_cc)
g_object_unref(new_cc);
@@ -4542,9 +4542,9 @@ sendmsg_window_set_field(BalsaSendmsg * bsmsg, const gchar * key,
if (g_ascii_strcasecmp(key, "to") == 0)
type = "To:";
else if(g_ascii_strcasecmp(key, "cc") == 0)
- type = "Cc:";
+ type = "CC:";
else if(g_ascii_strcasecmp(key, "bcc") == 0) {
- type = "Bcc:";
+ type = "BCC:";
if (!g_object_get_data(G_OBJECT(bsmsg->window),
"balsa-sendmsg-window-url-bcc")) {
GtkWidget *dialog =
@@ -4852,10 +4852,10 @@ bsmsg2message(BalsaSendmsg * bsmsg)
libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
message->headers->cc_list =
- libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:");
+ libbalsa_address_view_get_list(bsmsg->recipient_view, "CC:");
message->headers->bcc_list =
- libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:");
+ libbalsa_address_view_get_list(bsmsg->recipient_view, "BCC:");
/* get the fcc-box from the option menu widget */
@@ -5063,7 +5063,7 @@ check_suggest_encryption(BalsaSendmsg * bsmsg)
return TRUE;
/* we can not encrypt if we have bcc recipients */
- ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:");
+ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "BCC:");
len = internet_address_list_length(ia_list);
g_object_unref(ia_list);
if (len > 0)
@@ -5077,7 +5077,7 @@ check_suggest_encryption(BalsaSendmsg * bsmsg)
can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol);
g_object_unref(ia_list);
if (can_encrypt) {
- ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:");
+ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "CC:");
can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol);
g_object_unref(ia_list);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]