fixed local account
[claws.git] / src / inc.c
index e315bcaf9bdf7b4278b4fcf060051f8d4eba4a4f..11e9e49685e8e3c1a976b150d4f66da123f55417 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,6 +64,9 @@
 #include "automaton.h"
 #include "folder.h"
 #include "filtering.h"
+#include "selective_download.h"
+
+static GList *inc_dialog_list = NULL;
 
 static guint inc_lock_count = 0;
 
@@ -96,28 +99,32 @@ static gint pop3_automaton_terminate        (SockInfo               *source,
 static GHashTable *inc_get_uidl_table  (PrefsAccount           *ac_prefs);
 static void inc_write_uidl_list                (Pop3State              *state);
 
-#if USE_THREADS
-static gint connection_check_cb                (Automaton      *atm);
-#endif
-
-static void inc_pop3_recv_func         (SockInfo       *sock,
+static gboolean inc_pop3_recv_func     (SockInfo       *sock,
                                         gint            count,
                                         gint            read_bytes,
                                         gpointer        data);
 
 static void inc_put_error              (IncState        istate);
 
-static void inc_cancel                 (GtkWidget      *widget,
+static void inc_cancel_cb              (GtkWidget      *widget,
                                         gpointer        data);
 
 static gint inc_spool                  (void);
 static gint get_spool                  (FolderItem     *dest,
                                         const gchar    *mbox);
 
+static void inc_spool_account(PrefsAccount *account);
 static void inc_all_spool(void);
 static void inc_autocheck_timer_set_interval   (guint           interval);
 static gint inc_autocheck_func                 (gpointer        data);
 
+static void inc_notify_cmd             (gint new_msgs, 
+                                        gboolean notify);
+
+#define FOLDER_SUMMARY_MISMATCH(f, s) \
+       (f) && (s) ? ((s)->newmsgs != (f)->new) || ((f)->unread != (s)->unread) || ((f)->total != (s)->messages) \
+       : FALSE
+       
 /**
  * inc_finished:
  * @mainwin: Main window.
@@ -132,7 +139,7 @@ static void inc_finished(MainWindow *mainwin, gboolean new_messages)
        FolderItem *item;
 
        if (prefs_common.scan_all_after_inc)
-               folderview_update_all_node();
+               folderview_check_new(NULL);
 
        if (!new_messages && !prefs_common.scan_all_after_inc) return;
 
@@ -140,16 +147,20 @@ static void inc_finished(MainWindow *mainwin, gboolean new_messages)
                item = cur_account && cur_account->inbox
                        ? folder_find_item_from_path(cur_account->inbox)
                        : folder_get_default_inbox();
-               folderview_unselect(mainwin->folderview);
-               folderview_select(mainwin->folderview, item);
+               if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {      
+                       folderview_unselect(mainwin->folderview);
+                       folderview_select(mainwin->folderview, item);
+               }       
        } else {
                item = mainwin->summaryview->folder_item;
-               folderview_unselect(mainwin->folderview);
-               folderview_select(mainwin->folderview, item);
+               if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
+                       folderview_unselect(mainwin->folderview);
+                       folderview_select(mainwin->folderview, item);
+               }       
        }
 }
 
-void inc_mail(MainWindow *mainwin)
+void inc_mail(MainWindow *mainwin, gboolean notify)
 {
        gint new_msgs = 0;
 
@@ -178,32 +189,62 @@ void inc_mail(MainWindow *mainwin)
 
        inc_finished(mainwin, new_msgs > 0);
        main_window_unlock(mainwin);
+       inc_notify_cmd(new_msgs, notify);
        inc_autocheck_timer_set();
 }
 
+gint inc_selective_download(MainWindow *mainwin, gint session_type)
+{
+       PrefsAccount *account = cur_account;
+       gint new_msgs = 0;      
+
+       account->session_type = session_type;
+       new_msgs = inc_account_mail(account, mainwin);
+       account->session_type = RETR_NORMAL;
+       
+       return new_msgs;
+}
+
 static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
 {
        IncProgressDialog *inc_dialog;
        IncSession *session;
        gchar *text[3];
 
-       session = inc_session_new(account);
-       if (!session) return 0;
-
-       inc_dialog = inc_progress_dialog_create();
-       inc_dialog->queue_list = g_list_append(inc_dialog->queue_list, session);
-       inc_dialog->mainwin = mainwin;
-       session->data = inc_dialog;
-
-       text[0] = NULL;
-       text[1] = account->account_name;
-       text[2] = _("Standby");
-       gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
-
-       return inc_start(inc_dialog);
+       switch (account->protocol) {
+       case A_IMAP4:
+       case A_NNTP:
+               folderview_check_new(FOLDER(account->folder));
+               return 1;
+
+       case A_POP3:
+       case A_APOP:
+               session = inc_session_new(account);
+               if (!session) return 0;
+               
+               inc_dialog = inc_progress_dialog_create();
+               inc_dialog->queue_list = g_list_append(inc_dialog->queue_list,
+                                                      session);
+               inc_dialog->mainwin = mainwin;
+               session->data = inc_dialog;
+       
+               text[0] = NULL;
+               text[1] = account->account_name;
+               text[2] = _("Standby");
+               gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
+               
+               main_window_set_toolbar_sensitive(mainwin);
+               main_window_set_menu_sensitive(mainwin);
+               
+               return inc_start(inc_dialog);
+
+       case A_LOCAL:
+               inc_spool_account(account);
+               return 1;
+       }
 }
 
-void inc_all_account_mail(MainWindow *mainwin)
+void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
 {
        GList *list, *queue_list = NULL;
        IncProgressDialog *inc_dialog;
@@ -222,14 +263,27 @@ void inc_all_account_mail(MainWindow *mainwin)
        if (!list) {
                inc_finished(mainwin, new_msgs > 0);
                main_window_unlock(mainwin);
+               inc_notify_cmd(new_msgs, notify);
                inc_autocheck_timer_set();
                return;
        }
 
+       /* check local folders */
+       inc_all_spool();
+
+       /* check IMAP4 folders */
        for (; list != NULL; list = list->next) {
-               IncSession *session;
                PrefsAccount *account = list->data;
+               if ((account->protocol == A_IMAP4 ||
+                    account->protocol == A_NNTP) && account->recv_at_getall)
+                       folderview_check_new(FOLDER(account->folder));
+       }
 
+       /* check POP3 accounts */
+       for (list = account_get_list(); list != NULL; list = list->next) {
+               IncSession *session;
+               PrefsAccount *account = list->data;
+               account->session_type = RETR_NORMAL;
                if (account->recv_at_getall) {
                        session = inc_session_new(account);
                        if (session)
@@ -240,6 +294,7 @@ void inc_all_account_mail(MainWindow *mainwin)
        if (!queue_list) {
                inc_finished(mainwin, new_msgs > 0);
                main_window_unlock(mainwin);
+               inc_notify_cmd(new_msgs, notify);
                inc_autocheck_timer_set();
                return;
        }
@@ -259,10 +314,14 @@ void inc_all_account_mail(MainWindow *mainwin)
                gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
        }
 
+       main_window_set_toolbar_sensitive(mainwin);
+       main_window_set_menu_sensitive(mainwin);
+
        new_msgs += inc_start(inc_dialog);
 
        inc_finished(mainwin, new_msgs > 0);
        main_window_unlock(mainwin);
+       inc_notify_cmd(new_msgs, notify);
        inc_autocheck_timer_set();
 }
 
@@ -277,7 +336,7 @@ static IncProgressDialog *inc_progress_dialog_create(void)
        gtk_window_set_title(GTK_WINDOW(progress->window),
                             _("Retrieving new messages"));
        gtk_signal_connect(GTK_OBJECT(progress->cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(inc_cancel), dialog);
+                          GTK_SIGNAL_FUNC(inc_cancel_cb), dialog);
        gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
                           GTK_SIGNAL_FUNC(gtk_true), NULL);
        /* manage_window_set_transient(GTK_WINDOW(progress->window)); */
@@ -301,6 +360,8 @@ static IncProgressDialog *inc_progress_dialog_create(void)
        dialog->dialog = progress;
        dialog->queue_list = NULL;
 
+       inc_dialog_list = g_list_append(inc_dialog_list, dialog);
+
        return dialog;
 }
 
@@ -316,6 +377,8 @@ static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
 {
        g_return_if_fail(inc_dialog != NULL);
 
+       inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
+
        gtk_progress_bar_update
                (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
        progress_dialog_destroy(inc_dialog->dialog);
@@ -357,9 +420,7 @@ static Pop3State *inc_pop3_state_new(PrefsAccount *account)
 
        state->ac_prefs = account;
        state->folder_table = g_hash_table_new(NULL, NULL);
-       state->id_table = inc_get_uidl_table(account);
-       state->id_list = NULL;
-       state->new_id_list = NULL;
+       state->uidl_table = inc_get_uidl_table(account);
        state->inc_state = INC_SUCCESS;
 
        return state;
@@ -367,17 +428,18 @@ static Pop3State *inc_pop3_state_new(PrefsAccount *account)
 
 static void inc_pop3_state_destroy(Pop3State *state)
 {
+       gint n;
+
        g_hash_table_destroy(state->folder_table);
-       g_free(state->sizes);
 
-       if (state->id_table) {
-               hash_free_strings(state->id_table);
-               g_hash_table_destroy(state->id_table);
+       for (n = 1; n <= state->count; n++)
+               g_free(state->msg[n].uidl);
+       g_free(state->msg);
+
+       if (state->uidl_table) {
+               hash_free_strings(state->uidl_table);
+               g_hash_table_destroy(state->uidl_table);
        }
-       slist_free_strings(state->id_list);
-       slist_free_strings(state->new_id_list);
-       g_slist_free(state->id_list);
-       g_slist_free(state->new_id_list);
 
        g_free(state->greeting);
        g_free(state->user);
@@ -414,16 +476,11 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                                g_strdup(pop3_state->ac_prefs->tmp_pass);
                else {
                        gchar *pass;
-                       gchar *message;
 
-                       message = g_strdup_printf
-                               (_("Input password for %s on %s:"),
-                                pop3_state->user,
-                                pop3_state->ac_prefs->recv_server);
+                       pass = input_dialog_query_password
+                               (pop3_state->ac_prefs->recv_server,
+                                pop3_state->user);
 
-                       pass = input_dialog_with_invisible(_("Input password"),
-                                                          message, NULL);
-                       g_free(message);
                        if (inc_dialog->show_dialog)
                                manage_window_focus_in
                                        (inc_dialog->mainwin->window,
@@ -478,6 +535,47 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 
                statusbar_pop_all();
 
+               /* CLAWS: perform filtering actions on dropped message */
+               if (global_processing != NULL) {
+                       FolderItem *processing, *inbox;
+                       Folder *folder;
+                       MsgInfo *msginfo;
+                       GSList *msglist, *msglist_element;
+
+                       /* CLAWS: get default inbox (perhaps per account) */
+                       if (pop3_state->ac_prefs->inbox) {
+                               /* CLAWS: get destination folder / mailbox */
+                               inbox = folder_find_item_from_identifier(pop3_state->ac_prefs->inbox);
+                               if (!inbox)
+                                       inbox = folder_get_default_inbox();
+                       } else
+                               inbox = folder_get_default_inbox();
+
+                       /* get list of messages in processing */
+                       processing = folder_get_default_processing();
+                       folder_item_scan(processing);
+                       folder = processing->folder;
+                       msglist = folder->get_msg_list(folder, processing, FALSE);
+
+                       /* process messages */
+                       for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
+                               msginfo = (MsgInfo *) msglist_element->data;
+                               /* filter if enabled in prefs or move to inbox if not */
+                               if(pop3_state->ac_prefs->filter_on_recv) {
+                                       filter_message_by_msginfo_with_inbox(global_processing, msginfo,
+                                                                            pop3_state->folder_table,
+                                                                            inbox);
+                               } else {
+                                       folder_item_move_msg(inbox, msginfo);
+                                       g_hash_table_insert(pop3_state->folder_table, inbox,
+                                                           GINT_TO_POINTER(1));
+                               }
+                               procmsg_msginfo_free(msginfo);
+                       }
+                       g_slist_free(msglist);
+               }
+
+
                new_msgs += pop3_state->cur_total_num;
 
                if (!prefs_common.scan_all_after_inc) {
@@ -550,6 +648,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                pop3_getrange_last_send , pop3_getrange_last_recv,
                pop3_getrange_uidl_send , pop3_getrange_uidl_recv,
                pop3_getsize_list_send  , pop3_getsize_list_recv,
+               pop3_top_send           , pop3_top_recv,
                pop3_retr_send          , pop3_retr_recv,
                pop3_delete_send        , pop3_delete_recv,
                pop3_logout_send        , pop3_logout_recv
@@ -597,11 +696,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        GTK_EVENTS_FLUSH();
        statusbar_pop_all();
 
-#if USE_THREADS
-       if ((sockinfo = sock_connect_with_thread(server, port)) == NULL) {
-#else
        if ((sockinfo = sock_connect(server, port)) == NULL) {
-#endif
                log_warning(_("Can't connect to POP3 server: %s:%d\n"),
                            server, port);
                if(!prefs_common.noerrorpanel) {
@@ -634,14 +729,9 @@ static IncState inc_pop3_session_do(IncSession *session)
        log_verbosity_set(TRUE);
        recv_set_ui_func(inc_pop3_recv_func, session);
 
-#if USE_THREADS
-       atm->timeout_tag = gtk_timeout_add
-               (TIMEOUT_ITV, (GtkFunction)connection_check_cb, atm);
-#else
        atm->tag = sock_gdk_input_add(sockinfo,
                                      atm->state[atm->num].condition,
                                      automaton_input_cb, atm);
-#endif
 
        while (!atm->terminated)
                gtk_main_iteration();
@@ -649,9 +739,6 @@ static IncState inc_pop3_session_do(IncSession *session)
        log_verbosity_set(FALSE);
        recv_set_ui_func(NULL, NULL);
 
-#if USE_THREADS
-       /* pthread_join(sockinfo->connect_thr, NULL); */
-#endif
        automaton_destroy(atm);
 
        return pop3_state->inc_state;
@@ -710,9 +797,9 @@ static void inc_write_uidl_list(Pop3State *state)
 {
        gchar *path;
        FILE *fp;
-       GSList *cur;
+       gint n;
 
-       if (!state->id_list) return;
+       if (!state->uidl_is_valid) return;
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                           "uidl-", state->ac_prefs->recv_server,
@@ -723,14 +810,17 @@ static void inc_write_uidl_list(Pop3State *state)
                return;
        }
 
-       for (cur = state->id_list; cur != NULL; cur = cur->next) {
-               if (fputs((gchar *)cur->data, fp) == EOF) {
-                       FILE_OP_ERROR(path, "fputs");
-                       break;
-               }
-               if (fputc('\n', fp) == EOF) {
-                       FILE_OP_ERROR(path, "fputc");
-                       break;
+       for (n = 1; n <= state->count; n++) {
+               if (state->msg[n].uidl && state->msg[n].received &&
+                   !state->msg[n].deleted) {
+                       if (fputs(state->msg[n].uidl, fp) == EOF) {
+                               FILE_OP_ERROR(path, "fputs");
+                               break;
+                       }
+                       if (fputc('\n', fp) == EOF) {
+                               FILE_OP_ERROR(path, "fputc");
+                               break;
+                       }
                }
        }
 
@@ -738,46 +828,8 @@ static void inc_write_uidl_list(Pop3State *state)
        g_free(path);
 }
 
-#if USE_THREADS
-static gint connection_check_cb(Automaton *atm)
-{
-       Pop3State *state = atm->data;
-       IncProgressDialog *inc_dialog = state->session->data;
-       SockInfo *sockinfo = state->sockinfo;
-
-       /* g_print("connection check\n"); */
-
-       if (sockinfo->state == CONN_LOOKUPFAILED ||
-           sockinfo->state == CONN_FAILED) {
-               atm->timeout_tag = 0;
-               log_warning(_("Can't connect to POP3 server: %s:%d\n"),
-                           sockinfo->hostname, sockinfo->port);
-               if(!prefs_common.noerrorpanel) {
-                       if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
-                           ((prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE) && focus_window)) {
-                               manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
-                       }
-                       alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
-                                        sockinfo->hostname, sockinfo->port);
-                       manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
-               }
-               pop3_automaton_terminate(sockinfo, atm);
-               state->sockinfo = NULL;
-               return FALSE;
-       } else if (sockinfo->state == CONN_ESTABLISHED) {
-               atm->timeout_tag = 0;
-               atm->tag = sock_gdk_input_add(sockinfo,
-                                             atm->state[atm->num].condition,
-                                             automaton_input_cb, atm);
-               return FALSE;
-       } else {
-               return TRUE;
-       }
-}
-#endif
-
-static void inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
-                              gpointer data)
+static gboolean inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
+                                  gpointer data)
 {
        gchar buf[MSGBUFSIZE];
        IncSession *session = (IncSession *)data;
@@ -791,7 +843,8 @@ static void inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
        if (cur_total > state->total_bytes)
                cur_total = state->total_bytes;
 
-       Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
+       Xstrdup_a(total_size, to_human_readable(state->total_bytes),
+                 return FALSE);
        g_snprintf(buf, sizeof(buf),
                   _("Retrieving message (%d / %d) (%s / %s)"),
                   state->cur_msg, state->count,
@@ -804,6 +857,11 @@ static void inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
                (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
                 (gfloat)cur_total / (gfloat)state->total_bytes);
        GTK_EVENTS_FLUSH();
+
+       if (state->inc_state == INC_CANCEL)
+               return FALSE;
+       else
+               return TRUE;
 }
 
 void inc_progress_update(Pop3State *state, Pop3Phase phase)
@@ -844,6 +902,21 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
                progress_dialog_set_label
                        (dialog, _("Getting the size of messages (LIST)..."));
                break;
+       case POP3_TOP_SEND:
+       case POP3_TOP_RECV:
+               g_snprintf(buf, sizeof(buf),
+                          _("Retrieving header (%d / %d)"),
+                          state->cur_msg, state->count);
+               progress_dialog_set_label (dialog, buf);
+               progress_dialog_set_percentage
+                       (dialog,
+                        (gfloat)(state->cur_msg) /
+                        (gfloat)(state->count));
+               gtk_progress_bar_update 
+                       (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+                        (gfloat)(state->cur_msg) /
+                        (gfloat)(state->count));
+               break;
        case POP3_RETR_SEND:
        case POP3_RETR_RECV:
                Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
@@ -925,13 +998,6 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
                return -1;
        }
 
-       /* CLAWS: perform filtering actions on dropped message */
-       if (global_processing != NULL) { 
-               if (state->ac_prefs->filter_on_recv)
-                       filter_message(global_processing, inbox, msgnum,
-                                      state->folder_table);
-       }
-
        return 0;
 }
 
@@ -951,28 +1017,41 @@ static void inc_put_error(IncState istate)
        }
 }
 
-static void inc_cancel(GtkWidget *widget, gpointer data)
+static void inc_cancel(IncProgressDialog *dialog)
 {
-       IncProgressDialog *dialog = data;
-       IncSession *session = dialog->queue_list->data;
-       SockInfo *sockinfo = session->pop3_state->sockinfo;
+       IncSession *session;
+       SockInfo *sockinfo;
 
-       if (!sockinfo || session->atm->terminated == TRUE) return;
+       g_return_if_fail(dialog != NULL);
 
-#if USE_THREADS
-       if (sockinfo->state == CONN_READY ||
-           sockinfo->state == CONN_LOOKUPSUCCESS) {
-               pthread_cancel(sockinfo->connect_thr);
-               /* pthread_kill(sockinfo->connect_thr, SIGINT); */
-               g_print("connection was cancelled.\n");
-       }
-#endif
+       session = dialog->queue_list->data;
+       sockinfo = session->pop3_state->sockinfo;
+
+       if (!sockinfo || session->atm->terminated == TRUE) return;
 
        session->pop3_state->inc_state = INC_CANCEL;
        pop3_automaton_terminate(sockinfo, session->atm);
        session->pop3_state->sockinfo = NULL;
 }
 
+gboolean inc_is_active(void)
+{
+       return (inc_dialog_list != NULL);
+}
+
+void inc_cancel_all(void)
+{
+       GList *cur;
+
+       for (cur = inc_dialog_list; cur != NULL; cur = cur->next)
+               inc_cancel((IncProgressDialog *)cur->data);
+}
+
+static void inc_cancel_cb(GtkWidget *widget, gpointer data)
+{
+       inc_cancel((IncProgressDialog *)data);
+}
+
 static gint inc_spool(void)
 {
        gchar *mbox, *logname;
@@ -1015,7 +1094,8 @@ static void inc_all_spool(void)
                IncSession *session;
                PrefsAccount *account = list->data;
 
-               if (account->protocol == A_LOCAL)
+               if ((account->protocol == A_LOCAL) &&
+                   (account->recv_at_getall))
                        inc_spool_account(account);
        }
 }
@@ -1042,8 +1122,10 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox%d",
                   get_rc_dir(), G_DIR_SEPARATOR, (gint)mbox);
 
-       if (copy_mbox(mbox, tmp_mbox) < 0)
+       if (copy_mbox(mbox, tmp_mbox) < 0) {
+               unlock_mbox(mbox, lockfd, LOCK_FLOCK);
                return -1;
+       }
 
        debug_print(_("Getting new messages from %s into %s...\n"),
                    mbox, dest->path);
@@ -1086,6 +1168,26 @@ void inc_unlock(void)
 static guint autocheck_timer = 0;
 static gpointer autocheck_data = NULL;
 
+static void inc_notify_cmd(gint new_msgs, gboolean notify)
+{
+
+       gchar *buf;
+
+       if (!(new_msgs && notify && prefs_common.newmail_notify_cmd &&
+           *prefs_common.newmail_notify_cmd))
+                    return;
+       if ((buf = strchr(prefs_common.newmail_notify_cmd, '%')) &&
+               buf[1] == 'd' && !strchr(&buf[1], '%'))
+               buf = g_strdup_printf(prefs_common.newmail_notify_cmd, 
+                                     new_msgs);
+       else
+               buf = g_strdup(prefs_common.newmail_notify_cmd);
+
+       system(buf);
+
+       g_free(buf);
+}
 void inc_autocheck_timer_init(MainWindow *mainwin)
 {
        autocheck_data = mainwin;
@@ -1127,7 +1229,7 @@ static gint inc_autocheck_func(gpointer data)
                return FALSE;
        }
 
-       inc_all_account_mail(mainwin);
+       inc_all_account_mail(mainwin, prefs_common.newmail_notify_auto);
 
        return FALSE;
 }