[evolution-ews] Bug 764065 - [Camel] Use get methods for CamelMessageInfo fields
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] Bug 764065 - [Camel] Use get methods for CamelMessageInfo fields
- Date: Wed, 22 Jun 2016 10:15:12 +0000 (UTC)
commit 4e09c6d2968716319d4d4ee5b2be42e4a82b46db
Author: Corentin Noël <corentin elementary io>
Date: Wed Jun 22 12:14:53 2016 +0200
Bug 764065 - [Camel] Use get methods for CamelMessageInfo fields
src/camel/camel-ews-folder.c | 10 +++++-----
src/camel/camel-ews-summary.c | 8 ++++----
src/camel/camel-ews-utils.c | 12 ++++++------
src/utils/ews-camel-common.c | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 3da85ee..9900030 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -1019,7 +1019,7 @@ ews_suppress_read_receipt (ESoapMessage *msg,
for (iter = mi_list; iter; iter = g_slist_next (iter)) {
mi = iter->data;
- if (!mi || (camel_message_info_flags (mi) & CAMEL_EWS_MESSAGE_MSGFLAG_RN_PENDING) == 0)
+ if (!mi || (camel_message_info_get_flags (mi) & CAMEL_EWS_MESSAGE_MSGFLAG_RN_PENDING) == 0)
continue;
/* There was requested a read-receipt, but it is handled by evolution-ews,
@@ -1034,7 +1034,7 @@ ews_suppress_read_receipt (ESoapMessage *msg,
mi->info.flags = mi->info.flags & (~CAMEL_EWS_MESSAGE_MSGFLAG_RN_PENDING);
mi->info.dirty = TRUE;
- if (!camel_message_info_user_flag ((CamelMessageInfo *) mi, "receipt-handled"))
+ if (!camel_message_info_get_user_flag ((CamelMessageInfo *) mi, "receipt-handled"))
camel_message_info_set_user_flag ((CamelMessageInfo *) mi, "receipt-handled", TRUE);
camel_folder_summary_touch (mi->info.summary);
@@ -1064,7 +1064,7 @@ ews_sync_mi_flags (CamelFolder *folder,
for (iter = mi_list; iter; iter = g_slist_next (iter)) {
CamelEwsMessageInfo *mi = iter->data;
- if (mi && (camel_message_info_flags (mi) & CAMEL_EWS_MESSAGE_MSGFLAG_RN_PENDING) != 0)
+ if (mi && (camel_message_info_get_flags (mi) & CAMEL_EWS_MESSAGE_MSGFLAG_RN_PENDING) != 0)
break;
}
@@ -1289,7 +1289,7 @@ ews_synchronize_sync (CamelFolder *folder,
if (!mi)
continue;
- flags_set = camel_message_info_flags (mi);
+ flags_set = camel_message_info_get_flags (mi);
flags_changed = mi->server_flags ^ flags_set;
/* Exchange doesn't seem to have a sane representation
@@ -2060,7 +2060,7 @@ ews_transfer_messages_to_sync (CamelFolder *source,
if (!mi)
continue;
- flags_set = camel_message_info_flags (mi);
+ flags_set = camel_message_info_get_flags (mi);
/* Exchange doesn't seem to have a sane representation
* for most flags — not even replied/forwarded. */
diff --git a/src/camel/camel-ews-summary.c b/src/camel/camel-ews-summary.c
index e84f952..36e52d8 100644
--- a/src/camel/camel-ews-summary.c
+++ b/src/camel/camel-ews-summary.c
@@ -313,22 +313,22 @@ camel_ews_summary_add_message (CamelFolderSummary *summary,
mi->change_key = g_strdup (change_key);
/* Copy flags 'n' tags */
- mi->info.flags = camel_message_info_flags (info);
+ mi->info.flags = camel_message_info_get_flags (info);
- flag = camel_message_info_user_flags (info);
+ flag = camel_message_info_get_user_flags (info);
while (flag) {
camel_message_info_set_user_flag ((CamelMessageInfo *) mi, flag->name, TRUE);
flag = flag->next;
}
- tag = camel_message_info_user_tags (info);
+ tag = camel_message_info_get_user_tags (info);
while (tag) {
/* coverity[unchecked_value] */
camel_message_info_set_user_tag ((CamelMessageInfo *) mi, tag->name, tag->value);
tag = tag->next;
}
- mi->info.size = camel_message_info_size (info);
+ mi->info.size = camel_message_info_get_size (info);
mi->info.uid = camel_pstring_strdup (uid);
camel_folder_summary_add (summary, (CamelMessageInfo *) mi);
diff --git a/src/camel/camel-ews-utils.c b/src/camel/camel-ews-utils.c
index fe1acdf..27b7389 100644
--- a/src/camel/camel-ews-utils.c
+++ b/src/camel/camel-ews-utils.c
@@ -430,7 +430,7 @@ ews_utils_replace_server_user_flags (ESoapMessage *msg,
/* transfer camel flags to become the categories as an XML
* array of strings */
- for (flag = camel_message_info_user_flags (&mi->info); flag;
+ for (flag = camel_message_info_get_user_flags (&mi->info); flag;
flag = flag->next) {
const gchar *n = ews_utils_rename_label (flag->name, 0);
if (*n == '\0')
@@ -454,7 +454,7 @@ ews_utils_merge_server_user_flags (EEwsItem *item,
const CamelFlag *flag;
/* transfer camel flags to a list */
- for (flag = camel_message_info_user_flags (&mi->info); flag;
+ for (flag = camel_message_info_get_user_flags (&mi->info); flag;
flag = flag->next) {
if (!ews_utils_is_system_user_flag (flag->name))
list = g_slist_prepend (list, (gchar *) flag->name);
@@ -685,7 +685,7 @@ camel_ews_utils_update_follow_up_flags (EEwsItem *item,
if (flag_status == 1) {
/* complete */
- if (!camel_message_info_user_tag (info, "follow-up"))
+ if (!camel_message_info_get_user_tag (info, "follow-up"))
changed = camel_message_info_set_user_tag (info, "follow-up", followup_name ?
followup_name : "follow-up") || changed;
if (completed_tt != (time_t) 0) {
gchar *text = camel_header_format_date (completed_tt, 0);
@@ -982,9 +982,9 @@ ews_utils_update_followup_flags (ESoapMessage *msg,
g_return_if_fail (msg != NULL);
g_return_if_fail (mi != NULL);
- followup = camel_message_info_user_tag (mi, "follow-up");
- completed = camel_message_info_user_tag (mi, "completed-on");
- dueby = camel_message_info_user_tag (mi, "due-by");
+ followup = camel_message_info_get_user_tag (mi, "follow-up");
+ completed = camel_message_info_get_user_tag (mi, "completed-on");
+ dueby = camel_message_info_get_user_tag (mi, "due-by");
if (followup && !*followup)
followup = NULL;
diff --git a/src/utils/ews-camel-common.c b/src/utils/ews-camel-common.c
index 508afe0..498ac4a 100644
--- a/src/utils/ews-camel-common.c
+++ b/src/utils/ews-camel-common.c
@@ -121,7 +121,7 @@ create_mime_message_cb (ESoapMessage *msg,
guint32 message_camel_flags = 0;
if (create_data->info)
- message_camel_flags = camel_message_info_flags (create_data->info);
+ message_camel_flags = camel_message_info_get_flags (create_data->info);
e_soap_message_start_element (msg, "Message", NULL, NULL);
e_soap_message_start_element (msg, "MimeContent", NULL, NULL);
@@ -202,9 +202,9 @@ create_mime_message_cb (ESoapMessage *msg,
time_t completed_tt = (time_t) 0 , dueby_tt = (time_t) 0;
/* follow-up flags */
- followup = camel_message_info_user_tag (create_data->info, "follow-up");
- completed = camel_message_info_user_tag (create_data->info, "completed-on");
- dueby = camel_message_info_user_tag (create_data->info, "due-by");
+ followup = camel_message_info_get_user_tag (create_data->info, "follow-up");
+ completed = camel_message_info_get_user_tag (create_data->info, "completed-on");
+ dueby = camel_message_info_get_user_tag (create_data->info, "due-by");
if (followup && !*followup)
followup = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]