* src/main.c

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 272f0aaf942d3c7d6f1b1ff52c6103c82f960627..554162e6d328210eaf3c531b25cfb21713d205c6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -313,6 +313,11 @@ int main(int argc, char *argv[])
        /* ignore SIGPIPE signal for preventing sudden death of program */
        signal(SIGPIPE, SIG_IGN);
 
+       if (cmd.online_mode == ONLINE_MODE_OFFLINE)
+               main_window_toggle_work_offline(mainwin, TRUE);
+       if (cmd.online_mode == ONLINE_MODE_ONLINE)
+               main_window_toggle_work_offline(mainwin, FALSE);
+
        if (cmd.receive_all)
                inc_all_account_mail(mainwin, FALSE, 
                                     prefs_common.newmail_notify_manu);
@@ -342,11 +347,6 @@ int main(int argc, char *argv[])
                cmd.status_full_folders = NULL;
        }
 
-       if (cmd.online_mode == ONLINE_MODE_OFFLINE)
-               main_window_toggle_work_offline(mainwin, TRUE);
-       if (cmd.online_mode == ONLINE_MODE_ONLINE)
-               main_window_toggle_work_offline(mainwin, FALSE);
-
        prefs_toolbar_init();
 
        plugin_load_all("GTK");
@@ -519,7 +519,8 @@ static void initial_processing(FolderItem *item, gpointer data)
 
        main_window_cursor_wait(mainwin);
        
-       folder_item_apply_processing(item);
+        if (item->prefs->enable_processing)
+                folder_item_apply_processing(item);
 
        debug_print("done.\n");
        STATUSBAR_POP(mainwin);
@@ -876,9 +877,6 @@ static void open_compose_new(const gchar *address, GPtrArray *attach_files)
 static void send_queue(void)
 {
        GList *list;
-       FolderItem *def_outbox;
-
-       def_outbox = folder_get_default_outbox();
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                Folder *folder = list->data;
@@ -891,10 +889,6 @@ static void send_queue(void)
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
                        if (res)        
                                folder_item_scan(folder->queue);
-                       if (prefs_common.savemsg && folder->outbox) {
-                               if (folder->outbox == def_outbox)
-                                       def_outbox = NULL;
-                       }
                }
        }
 }