#include "filter.h"
#include "automaton.h"
#include "folder.h"
+#include "filtering.h"
#include "pixmaps/continue.xpm"
#include "pixmaps/complete.xpm"
#endif
static void inc_pop3_recv_func (SockInfo *sock,
- gint read_len,
+ gint read_bytes,
gpointer data);
static void inc_put_error (IncState istate);
static gint get_spool (FolderItem *dest,
const gchar *mbox);
+static void inc_all_spool(void);
+
+static gint inc_autocheck_func (gpointer data);
static void inc_finished(MainWindow *mainwin)
{
void inc_mail(MainWindow *mainwin)
{
+ inc_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
if (prefs_common.use_extinc && prefs_common.extinc_path) {
/* external incorporating program */
if ((pid = fork()) < 0) {
perror("fork");
+ inc_autocheck_timer_set();
return;
}
waitpid(pid, NULL, 0);
if (prefs_common.inc_local) inc_spool();
+ inc_all_spool();
} else {
if (prefs_common.inc_local) inc_spool();
+ inc_all_spool();
inc_account_mail(cur_account, mainwin);
}
inc_finished(mainwin);
+ inc_autocheck_timer_set();
}
static void inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
GList *list, *queue_list = NULL;
IncProgressDialog *inc_dialog;
+ inc_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
if (prefs_common.inc_local) inc_spool();
list = account_get_list();
- if (!list) return;
+ if (!list) {
+ inc_autocheck_timer_set();
+ return;
+ }
for (; list != NULL; list = list->next) {
IncSession *session;
}
}
- if (!queue_list) return;
+ if (!queue_list) {
+ inc_autocheck_timer_set();
+ return;
+ }
inc_dialog = inc_progress_dialog_create();
inc_dialog->queue_list = queue_list;
inc_start(inc_dialog);
inc_finished(mainwin);
+ inc_autocheck_timer_set();
}
static IncProgressDialog *inc_progress_dialog_create(void)
#if USE_THREADS
if ((sockinfo = sock_connect_with_thread(server, port)) == NULL) {
#else
- if ((sockinfo = sock_connect_nb(server, port)) == NULL) {
+ if ((sockinfo = sock_connect(server, port)) == NULL) {
#endif
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
server, port);
if (sockinfo->state == CONN_LOOKUPFAILED ||
sockinfo->state == CONN_FAILED) {
atm->timeout_tag = 0;
- pop3_automaton_terminate(sockinfo->sock, atm);
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
sockinfo->hostname, sockinfo->port);
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);
return FALSE;
} else if (sockinfo->state == CONN_ESTABLISHED) {
atm->timeout_tag = 0;
- atm->tag = gdk_input_add(sockinfo->sock,
- atm->state[atm->num].condition,
- automaton_input_cb, atm);
+ 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 read_len, gpointer data)
+static void inc_pop3_recv_func(SockInfo *sock, gint read_bytes, gpointer data)
{
+ gchar buf[MSGBUFSIZE];
IncSession *session = (IncSession *)data;
Pop3State *state = session->pop3_state;
IncProgressDialog *inc_dialog = session->data;
ProgressDialog *dialog = inc_dialog->dialog;
+ gint cur_total;
- state->cur_msg_bytes += read_len;
+ cur_total = state->cur_total_bytes + read_bytes;
+ if (cur_total > state->total_bytes)
+ cur_total = state->total_bytes;
- //g_snprintf(buf, sizeof(buf),
- // _("Retrieving message (%d / %d)"),
- // state->cur_msg, state->count);
- //progress_dialog_set_label(dialog, buf);
+ g_snprintf(buf, sizeof(buf),
+ _("Retrieving message (%d / %d) (%d / %d bytes)"),
+ state->cur_msg, state->count,
+ cur_total, state->total_bytes);
+ progress_dialog_set_label(dialog, buf);
progress_dialog_set_percentage
- (dialog,
- (gfloat)(state->cur_total_bytes + state->cur_msg_bytes) /
- (gfloat)(state->total_bytes));
+ (dialog, (gfloat)cur_total / (gfloat)state->total_bytes);
GTK_EVENTS_FLUSH();
}
case POP3_GETAUTH_PASS_RECV:
case POP3_GETAUTH_APOP_SEND:
case POP3_GETAUTH_APOP_RECV:
- progress_dialog_set_label(dialog, _("Authorizing"));
+ progress_dialog_set_label(dialog, _("Authorizing..."));
break;
case POP3_GETRANGE_STAT_SEND:
case POP3_GETRANGE_STAT_RECV:
+ progress_dialog_set_label
+ (dialog, _("Getting the number of new messages (STAT)..."));
+ break;
case POP3_GETRANGE_LAST_SEND:
case POP3_GETRANGE_LAST_RECV:
+ progress_dialog_set_label
+ (dialog, _("Getting the number of new messages (LAST)..."));
+ break;
case POP3_GETRANGE_UIDL_SEND:
case POP3_GETRANGE_UIDL_RECV:
- progress_dialog_set_label(dialog,
- _("Getting number of new messages"));
+ progress_dialog_set_label
+ (dialog, _("Getting the number of new messages (UIDL)..."));
+ break;
+ case POP3_GETSIZE_LIST_SEND:
+ case POP3_GETSIZE_LIST_RECV:
+ progress_dialog_set_label
+ (dialog, _("Getting the size of messages (LIST)..."));
break;
case POP3_RETR_SEND:
case POP3_RETR_RECV:
g_snprintf(buf, sizeof(buf),
- _("Retrieving message (%d / %d)"),
- state->cur_msg, state->count);
+ _("Retrieving message (%d / %d) (%d / %d bytes)"),
+ state->cur_msg, state->count,
+ state->cur_total_bytes, state->total_bytes);
progress_dialog_set_label(dialog, buf);
- //progress_dialog_set_percentage
- // (dialog, (gfloat)state->cur_msg / state->count);
progress_dialog_set_percentage
(dialog,
(gfloat)(state->cur_total_bytes) /
FolderItem *inbox;
FolderItem *dropfolder;
gint val;
+ gint msgnum;
if (state->ac_prefs->inbox) {
inbox = folder_find_item_from_path(state->ac_prefs->inbox);
return -1;
}
- if (state->ac_prefs->filter_on_recv) {
- dropfolder =
- filter_get_dest_folder(prefs_common.fltlist, file);
- if (!dropfolder) dropfolder = inbox;
- else if (!strcmp(dropfolder->path, FILTER_NOT_RECEIVE)) {
- g_warning(_("a message won't be received\n"));
- return 1;
- }
- } else
+
+ if (prefs_filtering == NULL) {
+ /* old filtering */
+ if (state->ac_prefs->filter_on_recv) {
+ dropfolder =
+ filter_get_dest_folder(prefs_common.fltlist, file);
+ if (!dropfolder) dropfolder = inbox;
+ else if (!strcmp(dropfolder->path, FILTER_NOT_RECEIVE)) {
+ g_warning(_("a message won't be received\n"));
+ return 1;
+ }
+ } else
+ dropfolder = inbox;
+ }
+ else {
+ /* new filtering */
dropfolder = inbox;
+ }
val = GPOINTER_TO_INT(g_hash_table_lookup
(state->folder_table, dropfolder));
GINT_TO_POINTER(1));
}
- if (folder_item_add_msg(dropfolder, file) < 0) {
+ if ((msgnum = folder_item_add_msg(dropfolder, file)) < 0) {
unlink(file);
return -1;
}
unlink(file);
+
+ if (prefs_filtering != NULL) {
+ /* new filtering */
+ if (state->ac_prefs->filter_on_recv) {
+ filter_message(prefs_filtering, dropfolder, msgnum,
+ state->folder_table);
+ }
+ }
+
return 0;
}
return msgs;
}
+static void inc_spool_account(PrefsAccount *account)
+{
+ FolderItem *inbox;
+ FolderItem *dropfolder;
+ gint val;
+
+ if (account->inbox) {
+ inbox = folder_find_item_from_path(account->inbox);
+ if (!inbox)
+ inbox = folder_get_default_inbox();
+ } else
+ inbox = folder_get_default_inbox();
+
+ get_spool(inbox, account->local_mbox);
+}
+
+static void inc_all_spool(void)
+{
+ GList *list = NULL;
+
+ list = account_get_list();
+ if (!list) return;
+
+ for (; list != NULL; list = list->next) {
+ IncSession *session;
+ PrefsAccount *account = list->data;
+
+ if (account->protocol == A_LOCAL)
+ inc_spool_account(account);
+ }
+}
+
static gint get_spool(FolderItem *dest, const gchar *mbox)
{
gint msgs, size;
gint lockfd;
- gchar *tmp_mbox = "/tmp/tmpmbox";
+ gchar tmp_mbox[MAXPATHLEN + 1];
GHashTable *folder_table = NULL;
g_return_val_if_fail(dest != NULL, -1);
if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0)
return -1;
+ 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)
return -1;
}
return msgs;
-}
\ No newline at end of file
+}
+
+static guint autocheck_timer = 0;
+static gpointer autocheck_data = NULL;
+
+void inc_autocheck_timer_init(MainWindow *mainwin)
+{
+ autocheck_data = mainwin;
+ inc_autocheck_timer_set();
+}
+
+void inc_autocheck_timer_set(void)
+{
+ inc_autocheck_timer_remove();
+
+ if (prefs_common.autochk_newmail && autocheck_data) {
+ autocheck_timer = gtk_timeout_add
+ (prefs_common.autochk_itv * 60000,
+ inc_autocheck_func,
+ autocheck_data);
+ }
+}
+
+void inc_autocheck_timer_remove(void)
+{
+ if (autocheck_timer) {
+ gtk_timeout_remove(autocheck_timer);
+ autocheck_timer = 0;
+ }
+}
+
+static gint inc_autocheck_func(gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ inc_all_account_mail(mainwin);
+
+ return FALSE;
+}
projects / claws.git / blobdiff