2005-12-30 [colin] 1.9.100cvs115
[claws.git] / src / imap.c
index 1052c6389252c46c05974c1a1f1e2a13521e91ca..1c61729f6faa14a919c98e9bff5f588d10ca158e 100644 (file)
@@ -1103,6 +1103,8 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
                        last_uid = new_uid;
                if (file_is_tmp)
                        g_unlink(real_file);
+
+               g_free(real_file);
        }
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
@@ -1828,17 +1830,19 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
        g_return_val_if_fail(item->path != NULL, -1);
        g_return_val_if_fail(name != NULL, -1);
 
+       session = imap_session_get(folder);
+       if (!session) {
+               return -1;
+       }
+       lock_session();
+
        if (strchr(name, imap_get_path_separator(IMAP_FOLDER(folder), item->path)) != NULL) {
                g_warning(_("New folder name must not contain the namespace "
                            "path separator"));
+               unlock_session();
                return -1;
        }
 
-       session = imap_session_get(folder);
-       if (!session) {
-               return -1;
-       }
-       lock_session();
        real_oldpath = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
        g_free(session->mbox);
@@ -1906,8 +1910,6 @@ static gint imap_remove_folder_real(Folder *folder, FolderItem *item)
        IMAPSession *session;
        gchar *path;
        gchar *cache_dir;
-       gint exists, recent, unseen;
-       guint32 uid_validity;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);
@@ -1920,14 +1922,6 @@ static gint imap_remove_folder_real(Folder *folder, FolderItem *item)
        lock_session();
        path = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
-       ok = imap_cmd_examine(session, "INBOX",
-                             &exists, &recent, &unseen, &uid_validity, FALSE);
-       if (ok != IMAP_SUCCESS) {
-               g_free(path);
-               unlock_session();
-               return -1;
-       }
-
        ok = imap_cmd_delete(session, path);
        if (ok != IMAP_SUCCESS) {
                gchar *tmp = g_strdup_printf("%s%c", path, 
@@ -2042,6 +2036,13 @@ static void *imap_get_uncached_messages_thread(void *data)
                imap_fetch_env_free(env_list);
        }
        
+       for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
+               struct mailimap_set * imapset;
+               
+               imapset = cur->data;
+               mailimap_set_free(imapset);
+       }
+       
        session_set_access_time(SESSION(session));
        stuff->done = TRUE;
        return newlist;
@@ -2320,45 +2321,6 @@ static gint imap_status(IMAPSession *session, IMAPFolder *folder,
        
        real_path = imap_get_real_path(folder, path);
 
-#if 0
-       if (time(NULL) - item->last_update >= 5 && item->last_update != 1) {
-               /* do the full stuff */
-               item->last_update = 1; /* force update */
-               debug_print("updating everything\n");
-               r = imap_status(session, folder, path, item,
-               &item->c_messages, &item->c_uid_next,
-               &item->c_uid_validity, &item->c_unseen, block);
-               if (r != MAILIMAP_NO_ERROR) {
-                       debug_print("status err %d\n", r);
-                       return IMAP_ERROR;
-               }
-               item->last_update = time(NULL);
-               if (messages) 
-                       *messages = item->c_messages;
-               if (uid_next)
-                       *uid_next = item->c_uid_next;
-               if (uid_validity)
-                       *uid_validity = item->c_uid_validity;
-               if (unseen)
-                       *unseen = item->c_unseen;
-               return 0;
-       } else if (time(NULL) - item->last_update < 5) {
-               /* return cached stuff */
-               debug_print("using cache\n");
-               if (messages) 
-                       *messages = item->c_messages;
-               if (uid_next)
-                       *uid_next = item->c_uid_next;
-               if (uid_validity)
-                       *uid_validity = item->c_uid_validity;
-               if (unseen)
-                       *unseen = item->c_unseen;
-               return 0;
-       }
-#endif
-
-       /* if we get there, we're updating cache */
-
        if (messages) {
                mask |= 1 << 0;
        }
@@ -2677,6 +2639,7 @@ static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
        flag_list = imap_flag_to_lep(flags);
        r = imap_threaded_append(session->folder, destfolder,
                         file, flag_list);
+       mailimap_flag_list_free(flag_list);
        if (new_uid != NULL)
                *new_uid = 0;
 
@@ -2722,6 +2685,7 @@ static gint imap_cmd_store(IMAPSession *session, struct mailimap_set * set,
                        mailimap_store_att_flags_new_remove_flags_silent(flag_list);
        
        r = imap_threaded_store(session->folder, set, store_att_flags);
+       mailimap_store_att_flags_free(store_att_flags);
        if (r != MAILIMAP_NO_ERROR) {
                
                return IMAP_ERROR;
@@ -3012,11 +2976,15 @@ static void *get_list_of_uids_thread(void *data)
 
        r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE, set,
                                 &lep_uidlist);
+       mailimap_set_free(set);
+       
        if (r == MAILIMAP_NO_ERROR) {
                GSList * fetchuid_list;
                
                fetchuid_list =
                        imap_uid_list_from_lep(lep_uidlist);
+               mailimap_search_result_free(lep_uidlist);
+               
                uidlist = g_slist_concat(fetchuid_list, uidlist);
        }
        else {
@@ -3028,6 +2996,7 @@ static void *get_list_of_uids_thread(void *data)
                if (r == MAILIMAP_NO_ERROR) {
                        fetchuid_list =
                                imap_uid_list_from_lep_tab(lep_uidtab);
+                       imap_fetch_uid_list_free(lep_uidtab);
                        uidlist = g_slist_concat(fetchuid_list, uidlist);
                }
        }
@@ -3100,7 +3069,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 
        selected_folder = (session->mbox != NULL) &&
                          (!strcmp(session->mbox, item->item.path));
-       if (selected_folder) {
+       if (selected_folder && time(NULL) - item->use_cache < 2) {
                ok = imap_cmd_noop(session);
                if (ok != IMAP_SUCCESS) {
                        debug_print("disconnected!\n");
@@ -3147,13 +3116,11 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                }
        }
 
-       if (!selected_folder)
-               item->uid_next = uid_next;
-
        /* If old uid_next matches new uid_next we can be sure no message
           was added to the folder */
-       if (( selected_folder && !session->folder_content_changed) ||
-           (!selected_folder && uid_next == item->uid_next)) {
+       debug_print("uid_next is %d and item->uid_next %d \n", 
+               uid_next, item->uid_next);
+       if (uid_next == item->uid_next) {
                nummsgs = g_slist_length(item->uid_list);
 
                /* If number of messages is still the same we
@@ -3162,6 +3129,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                   we discard our cache to start a new scan to find
                   out which numbers have been removed */
                if (exists == nummsgs) {
+                       debug_print("exists == nummsgs\n");
                        *msgnum_list = g_slist_copy(item->uid_list);
                        statusbar_pop_all();
                        unlock_session();
@@ -3211,6 +3179,8 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        remove_numbered_files_not_in_list(dir, *msgnum_list);
        g_free(dir);
        
+       item->uid_next = uid_next;
+       
        debug_print("get_num_list - ok - %i\n", nummsgs);
        statusbar_pop_all();
        unlock_session();
@@ -3354,7 +3324,7 @@ gboolean imap_scan_required(Folder *folder, FolderItem *_item)
        lock_session();
        selected_folder = (session->mbox != NULL) &&
                          (!strcmp(session->mbox, item->item.path));
-       if (selected_folder) {
+       if (selected_folder && time(NULL) - item->use_cache < 2) {
                ok = imap_cmd_noop(session);
                if (ok != IMAP_SUCCESS) {
                        debug_print("disconnected!\n");
@@ -3382,7 +3352,8 @@ gboolean imap_scan_required(Folder *folder, FolderItem *_item)
                item->c_uid_next = uid_next;
                item->c_uid_validity = uid_val;
                item->c_unseen = unseen;
-
+               debug_print("uidnext %d, item->uid_next %d, exists %d, item->item.total_msgs %d\n", 
+                       uid_next, item->uid_next, exists, item->item.total_msgs);
                if ((uid_next != item->uid_next) || (exists != item->item.total_msgs)) {
                        unlock_session();
                        return TRUE;
@@ -3836,12 +3807,12 @@ static void process_hashtable(IMAPFolderItem *item)
 {
        if (item->flags_set_table) {
                g_hash_table_foreach_remove(item->flags_set_table, process_flags, GINT_TO_POINTER(TRUE));
-               g_free(item->flags_set_table);
+               g_hash_table_destroy(item->flags_set_table);
                item->flags_set_table = NULL;
        }
        if (item->flags_unset_table) {
                g_hash_table_foreach_remove(item->flags_unset_table, process_flags, GINT_TO_POINTER(FALSE));
-               g_free(item->flags_unset_table);
+               g_hash_table_destroy(item->flags_unset_table);
                item->flags_unset_table = NULL;
        }
 }