/*
* 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
#include "gtkutils.h"
#include "statusbar.h"
#include "manage_window.h"
+#include "stock_pixmap.h"
#include "progressdialog.h"
#include "inputdialog.h"
#include "alertpanel.h"
#include "automaton.h"
#include "folder.h"
#include "filtering.h"
-
-#include "pixmaps/continue.xpm"
-#include "pixmaps/complete.xpm"
-#include "pixmaps/error.xpm"
+#include "selective_download.h"
static guint inc_lock_count = 0;
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_autocheck_timer_set_interval (guint interval);
static gint inc_autocheck_func (gpointer data);
+#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.
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;
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);
+ }
}
}
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];
+ if (account->protocol == A_IMAP4 || account->protocol == A_NNTP) {
+ folderview_check_new(FOLDER(account->folder));
+ return 1;
+ }
+
session = inc_session_new(account);
if (!session) return 0;
return;
}
+ /* 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)
progress_dialog_set_value(progress, 0.0);
- PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
- PIXMAP_CREATE(progress->clist,
- currentxpm, currentxpmmask, continue_xpm);
- PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
+ stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_COMPLETE,
+ &okxpm, &okxpmmask);
+ stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_CONTINUE,
+ ¤txpm, ¤txpmmask);
+ stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_ERROR,
+ &errorxpm, &errorxpmmask);
if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
(prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE &&
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,
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) {
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
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) {
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();
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;
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;
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,
(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)
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);
gint val;
gint msgnum;
+ /* CLAWS: get default inbox (perhaps per account) */
if (state->ac_prefs->inbox) {
- inbox = folder_find_item_from_path(state->ac_prefs->inbox);
+ /* CLAWS: get destination folder / mailbox */
+ inbox = folder_find_item_from_identifier(state->ac_prefs->inbox);
if (!inbox)
inbox = folder_get_default_inbox();
} else
return -1;
}
+ /* CLAWS: claws uses a global .processing folder for the filtering. */
if (global_processing == NULL) {
- /* old filtering */
if (state->ac_prefs->filter_on_recv) {
dropfolder =
filter_get_dest_folder(prefs_common.fltlist, file);
} else
dropfolder = inbox;
} else {
- /* new filtering */
- dropfolder = inbox;
+ dropfolder = folder_get_default_processing();
}
val = GPOINTER_TO_INT(g_hash_table_lookup
GINT_TO_POINTER(1));
}
+ /* add msg file to drop folder */
if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
unlink(file);
return -1;
}
- if (global_processing != NULL) {
- /* new filtering */
- if (state->ac_prefs->filter_on_recv)
- filter_message(global_processing, dropfolder, msgnum,
- state->folder_table);
- }
-
return 0;
}
if (!sockinfo || session->atm->terminated == TRUE) return;
-#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->pop3_state->inc_state = INC_CANCEL;
pop3_automaton_terminate(sockinfo, session->atm);
session->pop3_state->sockinfo = NULL;