2006-11-02 [colin] 2.5.6cvs19

[claws.git] / src / etpan / imap-thread.c

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 2634f0cd7dea0b6a140cb8151c6d9a849f4fe2cc..99c19197a35e82acefe42faa9cf451a7515cefac 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -418,7 +418,7 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
        if (cert == NULL) {
                g_warning("can't get cert\n");
                return 0;
-       } else if (ssl_certificate_check(cert, 
+       } else if (ssl_certificate_check(cert, NULL,
                (gchar *)param->server, (gushort)param->port) == TRUE) {
                X509_free(cert);
                return 0;
@@ -643,6 +643,7 @@ struct login_param {
        const char * login;
        const char * password;
        const char * type;
+       const char * server;
 };
 
 struct login_result {
@@ -667,6 +668,11 @@ static void login_run(struct etpan_thread_op * op)
        if (!strcmp(param->type, "LOGIN"))
                r = mailimap_login(param->imap,
                           param->login, param->password);
+       else if (!strcmp(param->type, "GSSAPI"))
+               r = mailimap_authenticate(param->imap,
+                       param->type, param->server, NULL, NULL,
+                       param->login, param->login,
+                       param->password, NULL);
        else 
                r = mailimap_authenticate(param->imap,
                        param->type, NULL, NULL, NULL,
@@ -694,6 +700,10 @@ int imap_threaded_login(Folder * folder,
        param.login = login;
        param.password = password;
        param.type = type;
+       if (folder && folder->account)
+               param.server = folder->account->recv_server;
+       else
+               param.server = NULL;
 
        threaded_run(folder, &param, &result, login_run);
        
@@ -1187,14 +1197,12 @@ static void search_run(struct etpan_thread_op * op)
        
        param = op->param;
        
-       if (param->set == NULL && param->type == IMAP_SEARCH_TYPE_SIMPLE) {
-               g_warning("broken search");
-       }
-       
        /* we copy the mailimap_set because freeing the key is recursive */
-       if (param->set != NULL)
+       if (param->set != NULL) {
                uid_key = mailimap_search_key_new_uid(sc_mailimap_set_copy(param->set));
-       
+       } else if (param->type == IMAP_SEARCH_TYPE_SIMPLE) {
+               uid_key = mailimap_search_key_new_all();
+       }
        search_type_key = NULL;
        switch (param->type) {
        case IMAP_SEARCH_TYPE_SIMPLE:
@@ -2209,7 +2217,8 @@ static void append_run(struct etpan_thread_op * op)
        char * data;
        size_t size;
        struct stat stat_buf;
-       int fd, uid = 0;
+       int fd;
+       guint32 uid = 0, val = 0;
        
        param = op->param;
        result = op->result;
@@ -2236,9 +2245,9 @@ static void append_run(struct etpan_thread_op * op)
        
        mailstream_logger = imap_logger_append;
        
-       r = mailimap_append(param->imap, param->mailbox,
+       r = mailimap_uidplus_append(param->imap, param->mailbox,
                            param->flag_list, NULL,
-                           data, size/*, &uid */);
+                           data, size, &val, &uid);
 
        mailstream_logger = imap_logger_cmd;
        
@@ -2329,6 +2338,8 @@ struct copy_param {
 
 struct copy_result {
        int error;
+       struct mailimap_set *source;
+       struct mailimap_set *dest;
 };
 
 static void copy_run(struct etpan_thread_op * op)
@@ -2336,19 +2347,28 @@ static void copy_run(struct etpan_thread_op * op)
        struct copy_param * param;
        struct copy_result * result;
        int r;
-       
+       guint32 val;
        param = op->param;
+       struct mailimap_set *source = NULL, *dest = NULL;
        
-       r = mailimap_uid_copy(param->imap, param->set, param->mb);
+       r = mailimap_uidplus_uid_copy(param->imap, param->set, param->mb,
+               &val, &source, &dest);
        
        result = op->result;
        result->error = r;
-       
+       if (r == 0) {
+               result->source = source;
+               result->dest = dest;
+       } else {
+               result->source = NULL;
+               result->dest = NULL;
+       }
        debug_print("imap copy run - end %i\n", r);
 }
 
 int imap_threaded_copy(Folder * folder, struct mailimap_set * set,
-                      const char * mb)
+                      const char * mb, struct mailimap_set **source,
+                      struct mailimap_set **dest)
 {
        struct copy_param param;
        struct copy_result result;
@@ -2362,10 +2382,15 @@ int imap_threaded_copy(Folder * folder, struct mailimap_set * set,
        param.mb = mb;
        
        threaded_run(folder, &param, &result, copy_run);
+       *source = NULL;
+       *dest = NULL;
        
        if (result.error != MAILIMAP_NO_ERROR)
                return result.error;
        
+       *source = result.source;
+       *dest = result.dest;
+
        debug_print("imap copy - end\n");
        
        return result.error;