1 files changed, 43 insertions, 1 deletions

diff --git a/kmicromail/libetpan/generic/pop3driver_cached.c b/kmicromail/libetpan/generic/pop3driver_cached.c
index 6f97303..24f624b 100644
--- a/kmicromail/libetpan/generic/pop3driver_cached.c
+++ b/kmicromail/libetpan/generic/pop3driver_cached.c
@@ -107,12 +107,15 @@ static int
 pop3driver_cached_get_envelopes_list(mailsession * session,
     struct mailmessage_list * env_list);
 
 static int pop3driver_cached_get_message(mailsession * session,
     uint32_t num, mailmessage ** result);
 
+static int pop3driver_cached_get_message_by_uid(mailsession * session,
+    const char * uid, mailmessage ** result);
+
 static mailsession_driver local_pop3_cached_session_driver = {
   .sess_name = "pop3-cached",
 
   .sess_initialize = pop3driver_cached_initialize,
   .sess_uninitialize = pop3driver_cached_uninitialize,
 
@@ -140,24 +143,25 @@ static mailsession_driver local_pop3_cached_session_driver = {
   .sess_list_folders = NULL,
   .sess_lsub_folders = NULL,
   .sess_subscribe_folder = NULL,
   .sess_unsubscribe_folder = NULL,
 
   .sess_append_message = NULL,
+  .sess_append_message_flags = NULL,
   .sess_copy_message = NULL,
   .sess_move_message = NULL,
 
   .sess_get_messages_list = pop3driver_cached_get_messages_list,
   .sess_get_envelopes_list = pop3driver_cached_get_envelopes_list,
   .sess_remove_message = pop3driver_cached_remove_message,
 #if 0
   .sess_search_messages = maildriver_generic_search_messages,
 #endif
 
   .sess_get_message = pop3driver_cached_get_message,
-  .sess_get_message_by_uid = NULL,
+  .sess_get_message_by_uid = pop3driver_cached_get_message_by_uid,
 };
 
 mailsession_driver * pop3_cached_session_driver =
 &local_pop3_cached_session_driver;
 
 #define ENV_NAME "env.db"
@@ -852,6 +856,44 @@ static int pop3driver_cached_get_message(mailsession * session,
   }
 
   * result = msg_info;
 
   return MAIL_NO_ERROR;
 }
+
+static int pop3driver_cached_get_message_by_uid(mailsession * session,
+				  const char * uid, mailmessage ** result)
+{
+  mailpop3 * pop3;
+  struct mailpop3_msg_info * msg_info;
+  int found;
+  unsigned int i;
+  
+  if (uid == NULL)
+    return MAIL_ERROR_INVAL;
+  
+  pop3 = get_pop3_session(session);
+  
+  found = 0;
+  
+  /* iterate all messages and look for uid */
+  for(i = 0 ; i < carray_count(pop3->pop3_msg_tab) ; i++) {
+    msg_info = carray_get(pop3->pop3_msg_tab, i);
+    
+    if (msg_info == NULL)
+      continue;
+    
+    if (msg_info->msg_deleted)
+      continue;
+    
+    /* uid found, stop looking */
+    if (strcmp(msg_info->msg_uidl, uid) == 0) {
+      found = 1;
+      break;
+    }
+  }
+  
+  if (!found)
+    return MAIL_ERROR_MSG_NOT_FOUND;
+  
+  return pop3driver_cached_get_message(session, msg_info->msg_index, result);
+}