2006-08-22 [colin] 2.4.0cvs73

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index f6c9cc6568a577b52da34a3be78304e05c44ef89..85c889e19812a8d5f6c46bc04c029405e3ed74af 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -46,6 +46,7 @@
 #include "summaryview.h"
 #include "log.h"
 #include "timing.h"
+#include "inc.h"
 
 static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr);
 
@@ -250,8 +251,11 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
        START_TIMING("procmsg_get_thread_tree");
        root = g_node_new(NULL);
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
-       subject_relation = g_relation_new(2);
-       g_relation_index(subject_relation, 0, g_str_hash, g_str_equal);
+       
+       if (prefs_common.thread_by_subject) {
+               subject_relation = g_relation_new(2);
+               g_relation_index(subject_relation, 0, g_str_hash, g_str_equal);
+       }
 
        for (; mlist != NULL; mlist = mlist->next) {
                msginfo = (MsgInfo *)mlist->data;
@@ -333,7 +337,9 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                END_TIMING();
        }
        
-       g_relation_destroy(subject_relation);
+       if (prefs_common.thread_by_subject)
+               g_relation_destroy(subject_relation);
+
        g_hash_table_destroy(msgid_table);
        END_TIMING();
        return root;
@@ -879,6 +885,7 @@ static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo,
        return TRUE;
 }
 
+static gboolean send_queue_lock = FALSE;
 /*!
  *\brief       Send messages in queue
  *
@@ -894,7 +901,6 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
        GSList *list, *elem;
        GSList *sorted_list = NULL;
        GNode *node, *next;
-       static gboolean send_queue_lock = FALSE;
        
        if (send_queue_lock) {
                log_error(_("Already trying to send\n"));
@@ -902,12 +908,21 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                        if (*errstr) g_free(*errstr);
                        *errstr = g_strdup_printf(_("Already trying to send."));
                }
+               toolbar_main_set_sensitive(mainwindow_get_mainwindow());
                return -1;
        }
        send_queue_lock = TRUE;
+       inc_lock();
        if (!queue)
                queue = folder_get_default_queue();
-       g_return_val_if_fail(queue != NULL, -1);
+       
+       if (queue == NULL) {
+               send_queue_lock = FALSE;
+               inc_unlock();
+               return -1;
+       }
+
+       toolbar_main_set_sensitive(mainwindow_get_mainwindow());
 
        folder_item_scan(queue);
        list = folder_item_get_msg_list(queue);
@@ -959,9 +974,17 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                }
        }
        send_queue_lock = FALSE;
+       inc_unlock();
+       toolbar_main_set_sensitive(mainwindow_get_mainwindow());
+
        return (err != 0 ? -err : sent);
 }
 
+gboolean procmsg_is_sending(void)
+{
+       return send_queue_lock;
+}
+
 /*!
  *\brief       Determine if a queue folder is empty
  *
@@ -1070,7 +1093,6 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                        g_warning("can't save message\n");
                        return -1;
                }
-               return 0;
        }
        msginfo = folder_item_get_msginfo(outbox, num);         /* refcnt++ */
        tmp_msginfo = procmsg_msginfo_get_full_info(msginfo);   /* refcnt++ */ 
@@ -1081,8 +1103,8 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                if (tmp_msginfo && (msginfo->dispositionnotificationto || 
                    msginfo->returnreceiptto)) {
                        procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0); 
-                       procmsg_msginfo_free(msginfo);          /* refcnt-- */
                }       
+               procmsg_msginfo_free(tmp_msginfo);              /* refcnt-- */
        }
 
        return 0;
@@ -1739,7 +1761,9 @@ send_mail:
 
 gint procmsg_send_message_queue(const gchar *file, gchar **errstr)
 {
-       return procmsg_send_message_queue_full(file, FALSE, errstr);
+       gint result = procmsg_send_message_queue_full(file, FALSE, errstr);
+       toolbar_main_set_sensitive(mainwindow_get_mainwindow());
+       return result;
 }
 
 static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPermFlags old_flags)
@@ -2067,7 +2091,7 @@ void procmsg_msginfo_set_to_folder(MsgInfo *msginfo, FolderItem *to_folder)
  * \return TRUE if the message was moved and MsgInfo is now invalid,
  *         FALSE otherwise
  */
-gboolean procmsg_msginfo_filter(MsgInfo *msginfo)
+gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
 {
        MailFilteringData mail_filtering_data;
                        
@@ -2078,7 +2102,7 @@ gboolean procmsg_msginfo_filter(MsgInfo *msginfo)
 
        /* filter if enabled in prefs or move to inbox if not */
        if((filtering_rules != NULL) &&
-          filter_message_by_msginfo(filtering_rules, msginfo)) {
+          filter_message_by_msginfo(filtering_rules, msginfo, ac_prefs)) {
                return TRUE;
        }
                
@@ -2180,3 +2204,19 @@ FolderItem *procmsg_spam_get_folder (void)
        FolderItem *item = spam_folder_item ? folder_find_item_from_identifier(spam_folder_item) : NULL;
        return item ? item : folder_get_default_trash();
 }
+
+static void item_has_queued_mails(FolderItem *item, gpointer data)
+{
+       gboolean *result = (gboolean *)data;
+       if (*result == TRUE)
+               return;
+       if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0)
+               *result = TRUE;
+}
+
+gboolean procmsg_have_queued_mails_fast (void)
+{
+       gboolean result = FALSE;
+       folder_func_to_all_folders(item_has_queued_mails, &result);
+       return result;
+}