Mail fixes and libetpan updated

1 files changed, 28 insertions, 0 deletions

diff --git a/kmicromail/libetpan/generic/imapdriver.c b/kmicromail/libetpan/generic/imapdriver.c
index 0d63319..b3e5982 100644
--- a/kmicromail/libetpan/generic/imapdriver.c
+++ b/kmicromail/libetpan/generic/imapdriver.c
@@ -95,16 +95,18 @@ static int imapdriver_unseen_number(mailsession * session, char * mb,
 static int imapdriver_list_folders(mailsession * session, char * mb,
 				    struct mail_list ** result);
 static int imapdriver_lsub_folders(mailsession * session, char * mb,
 				   struct mail_list ** result);
 static int imapdriver_subscribe_folder(mailsession * session, char * mb);
 static int imapdriver_unsubscribe_folder(mailsession * session, char * mb);
 static int imapdriver_append_message(mailsession * session,
 				     char * message, size_t size);
+static int imapdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int imapdriver_copy_message(mailsession * session,
 				   uint32_t num, char * mb);
 
 static int imapdriver_get_messages_list(mailsession * session,
 					struct mailmessage_list ** result);
 
 static int
 imapdriver_get_envelopes_list(mailsession * session,
@@ -152,16 +154,17 @@ static mailsession_driver local_imap_session_driver = {
   .sess_recent_number = imapdriver_recent_number,
   .sess_unseen_number = imapdriver_unseen_number,
   .sess_list_folders = imapdriver_list_folders,
   .sess_lsub_folders = imapdriver_lsub_folders,
   .sess_subscribe_folder = imapdriver_subscribe_folder,
   .sess_unsubscribe_folder = imapdriver_unsubscribe_folder,
 
   .sess_append_message = imapdriver_append_message,
+  .sess_append_message_flags = imapdriver_append_message_flags,
   .sess_copy_message = imapdriver_copy_message,
   .sess_move_message = NULL,
 
   .sess_get_messages_list = imapdriver_get_messages_list,
   .sess_get_envelopes_list = imapdriver_get_envelopes_list,
   .sess_remove_message = NULL,
 #if 0
   .sess_search_messages = imapdriver_search_messages,
@@ -766,16 +769,41 @@ static int imapdriver_append_message(mailsession * session,
 
   r = mailimap_append_simple(get_imap_session(session),
       get_data(session)->imap_mailbox,
       message, size);
   
   return imap_error_to_mail_error(r);
 }
 
+static int imapdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  struct mailimap_flag_list * flag_list;
+  int r;
+  
+  if (flags != NULL) {
+    r = imap_flags_to_imap_flags(flags, &flag_list);
+    if (r != MAIL_NO_ERROR)
+      return r;
+  }
+  else {
+    flag_list = NULL;
+  }
+  
+  r = mailimap_append(get_imap_session(session),
+      get_data(session)->imap_mailbox,
+      flag_list, NULL, message, size);
+  
+  if (flag_list != NULL)
+    mailimap_flag_list_free(flag_list);
+  
+  return imap_error_to_mail_error(r);
+}
+
 static int imapdriver_copy_message(mailsession * session,
 				   uint32_t num, char * mb)
 {
   int r;
   struct mailimap_set * set;
   int res;
 
   set = mailimap_set_new_single(num);