1 files changed, 31 insertions, 7 deletions

diff --git a/kmicromail/libetpan/generic/imapdriver_tools.c b/kmicromail/libetpan/generic/imapdriver_tools.c
index 3d737f3..de4008f 100644
--- a/kmicromail/libetpan/generic/imapdriver_tools.c
+++ b/kmicromail/libetpan/generic/imapdriver_tools.c
@@ -3098,34 +3098,33 @@ static int imap_flags_to_flags(struct mailimap_msg_att_dynamic * att_dyn,
   }
 
   * result = flags;
   
   return MAIL_NO_ERROR;
 
  free:
   mail_flags_free(flags);
  err:
   return MAIL_ERROR_MEMORY;
 }
 
-static int flags_to_imap_flags(struct mail_flags * flags,
-                               struct mailimap_store_att_flags ** result)
+int imap_flags_to_imap_flags(struct mail_flags * flags,
+    struct mailimap_flag_list ** result)
 {
   struct mailimap_flag * flag;
   struct mailimap_flag_list * flag_list;
-  struct mailimap_store_att_flags * att_flags;
   int res;
   clistiter * cur;
   int r;
-  
+
   flag_list = mailimap_flag_list_new_empty();
   if (flag_list == NULL) {
     res = MAIL_ERROR_MEMORY;
     goto err;
   }
 
   if ((flags->fl_flags & MAIL_FLAG_DELETED) != 0) {
     flag = mailimap_flag_new_deleted();
     if (flag == NULL) {
       res = MAIL_ERROR_MEMORY;
       goto free_flag_list;
     }
@@ -3230,35 +3229,60 @@ static int flags_to_imap_flags(struct mail_flags * flags,
         free(flag_str);
         res = MAIL_ERROR_MEMORY;
         goto free_flag_list;
       }
       r = mailimap_flag_list_add(flag_list, flag);
       if (r != MAILIMAP_NO_ERROR) {
         mailimap_flag_free(flag);
         res = MAIL_ERROR_MEMORY;
         goto free_flag_list;
       }
     }
   }
+  
+  * result = flag_list;
+  
+  return MAIL_NO_ERROR;
+  
+ free_flag_list: 
+  mailimap_flag_list_free(flag_list);
+ err:
+  return res;
+}
 
+static int flags_to_imap_flags(struct mail_flags * flags,
+                               struct mailimap_store_att_flags ** result)
+{
+  struct mailimap_flag_list * flag_list;
+  struct mailimap_store_att_flags * att_flags;
+  int res;
+  int r;
+  
+  r = imap_flags_to_imap_flags(flags,
+      &flag_list);
+  if (r != MAIL_NO_ERROR) {
+    res = r;
+    goto err;
+  }
+  
   att_flags = mailimap_store_att_flags_new_set_flags_silent(flag_list);
   if (att_flags == NULL) {
     res = MAIL_ERROR_MEMORY;
     goto free_flag_list;
   }
-
+  
   * result = att_flags;
-
+  
   return MAIL_NO_ERROR;
-
+  
  free_flag_list: 
   mailimap_flag_list_free(flag_list);
  err:
   return res;
 }
 
 
 static int
 imap_fetch_result_to_flags(clist * fetch_result, uint32_t index,
                            struct mail_flags ** result)
 {
   clistiter * cur;