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
@@ -79,48 +79,50 @@ static int imapdriver_examine_folder(mailsession * session, char * mb);
 static int imapdriver_select_folder(mailsession * session, char * mb);
 static int imapdriver_expunge_folder(mailsession * session);
 
 static int imapdriver_status_folder(mailsession * session, char * mb,
     uint32_t * result_messages, uint32_t * result_recent,
     uint32_t * result_unseen);
 
 static int imapdriver_messages_number(mailsession * session, char * mb,
                                       uint32_t * result);
 
 static int imapdriver_recent_number(mailsession * session, char * mb,
                                       uint32_t * result);
 
 static int imapdriver_unseen_number(mailsession * session, char * mb,
                                       uint32_t * result);
 
 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,
                               struct mailmessage_list * env_list);
 
 
 #if 0
 static int imapdriver_search_messages(mailsession * session, char * charset,
                                       struct mail_search_key * key,
                                       struct mail_search_result ** result);
 #endif
 
 static int imapdriver_get_message(mailsession * session,
                                   uint32_t num, mailmessage ** result);
 
 static int imapdriver_get_message_by_uid(mailsession * session,
     const char * uid,
     mailmessage ** result);
 
@@ -136,48 +138,49 @@ static mailsession_driver local_imap_session_driver = {
   .sess_connect_path = NULL,
   .sess_starttls = imapdriver_starttls,
   .sess_login = imapdriver_login,
   .sess_logout = imapdriver_logout,
   .sess_noop = imapdriver_noop,
 
   .sess_build_folder_name = imapdriver_build_folder_name,
   .sess_create_folder = imapdriver_create_folder,
   .sess_delete_folder = imapdriver_delete_folder,
   .sess_rename_folder = imapdriver_rename_folder,
   .sess_check_folder = imapdriver_check_folder,
   .sess_examine_folder = imapdriver_examine_folder,
   .sess_select_folder = imapdriver_select_folder,
   .sess_expunge_folder = imapdriver_expunge_folder,
   .sess_status_folder = imapdriver_status_folder,
   .sess_messages_number = imapdriver_messages_number,
   .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,
 #endif
   
   .sess_get_message = imapdriver_get_message,
   .sess_get_message_by_uid = imapdriver_get_message_by_uid,
 };
 
 mailsession_driver * imap_session_driver = &local_imap_session_driver;
 
 static inline struct imap_session_state_data * get_data(mailsession * session)
 {
   return session->sess_data;
 }
 
 static mailimap * get_imap_session(mailsession * session)
 {
   return get_data(session)->imap_session;
@@ -750,48 +753,73 @@ static int imapdriver_subscribe_folder(mailsession * session, char * mb)
 
 static int imapdriver_unsubscribe_folder(mailsession * session, char * mb)
 {
   int r;
 
   r = mailimap_unsubscribe(get_imap_session(session), mb);
 
   return imap_error_to_mail_error(r);
 }
 
 /* messages operations */
 
 static int imapdriver_append_message(mailsession * session,
                                      char * message, size_t size)
 {
   int r;
 
   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);
   if (set == NULL) {
     res = MAIL_ERROR_MEMORY;
     goto err;
   }
 
   r = mailimap_uid_copy(get_imap_session(session), set, mb);
 
   mailimap_set_free(set);
 
   return imap_error_to_mail_error(r);
 
  err:
   return res;
 }
 
 static int imapdriver_get_messages_list(mailsession * session,