#include <stdio.h>
#include <unistd.h>
#include <string.h>
+#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
folderview_unselect(mainwin->folderview);
folderview_select(mainwin->folderview, item);
}
- } else {
+ } else if (prefs_common.scan_all_after_inc) {
item = mainwin->summaryview->folder_item;
if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
- folderview_unselect(mainwin->folderview);
- folderview_select(mainwin->folderview, item);
+ folderview_update_item(item, TRUE);
}
}
}
return;
inc_autocheck_timer_remove();
- summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
if (prefs_common.inc_local)
new_msgs = inc_spool();
+
+ if (new_msgs <= 0)
+ new_msgs = 1;
} else {
if (prefs_common.inc_local)
new_msgs = inc_spool();
inc_autocheck_timer_set();
}
-gint inc_selective_download(MainWindow *mainwin, gint session_type)
+void inc_selective_download(MainWindow *mainwin, PrefsAccount *acc, gint session)
{
- PrefsAccount *account = cur_account;
- gint new_msgs = 0;
+ GSList *cur;
+ gint new_msgs = 0;
- account->session_type = session_type;
- new_msgs = inc_account_mail(account, mainwin);
- account->session_type = RETR_NORMAL;
+ acc->session = session;
+ inc_account_mail(acc, mainwin);
+ acc->session = STYPE_NORMAL;
- return new_msgs;
+ for (cur = acc->msg_list; cur != NULL; cur = cur->next) {
+ HeaderItems *items =(HeaderItems*)cur->data;
+
+ if (items->state == SD_DOWNLOADED &&
+ items->del_by_old_session == FALSE) {
+ new_msgs++;
+ }
+ }
+
+ if (new_msgs) {
+ inc_finished(mainwin, TRUE);
+ inc_notify_cmd(new_msgs, prefs_common.newmail_notify_manu);
+ }
}
static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
text[2] = _("Standby");
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
- main_window_set_toolbar_sensitive(mainwin);
+ toolbar_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
return inc_start(inc_dialog);
inc_spool_account(account);
return 1;
}
+ return 0;
}
void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
if (inc_lock_count) return;
inc_autocheck_timer_remove();
- summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
- if (prefs_common.inc_local)
+ if (prefs_common.inc_local) {
new_msgs = inc_spool();
+ if (new_msgs < 0)
+ new_msgs = 0;
+ }
list = account_get_list();
if (!list) {
for (list = account_get_list(); list != NULL; list = list->next) {
IncSession *session;
PrefsAccount *account = list->data;
- account->session_type = RETR_NORMAL;
+ account->session = STYPE_NORMAL;
if (account->recv_at_getall) {
session = inc_session_new(account);
if (session)
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
}
- main_window_set_toolbar_sensitive(mainwin);
+ toolbar_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
new_msgs += inc_start(inc_dialog);
state->uidl_todelete_list = NULL;
state->uidl_table = inc_get_uidl_table(account);
state->inc_state = INC_SUCCESS;
+ state->current_time = time(NULL);
return state;
}
}
if (pop3_state->error_val == PS_AUTHFAIL) {
- if(!prefs_common.noerrorpanel) {
+ if(!prefs_common.no_recv_err_panel) {
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);
/* CLAWS: perform filtering actions on dropped message */
if (global_processing != NULL) {
FolderItem *processing, *inbox;
- Folder *folder;
MsgInfo *msginfo;
GSList *msglist, *msglist_element;
/* 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);
+ msglist = folder_item_get_msg_list(processing);
/* process messages */
for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
new_msgs += pop3_state->cur_total_num;
- if (!prefs_common.scan_all_after_inc) {
- folder_item_scan_foreach(pop3_state->folder_table);
- folderview_update_item_foreach
- (pop3_state->folder_table);
- }
+ folderview_update_item_foreach
+ (pop3_state->folder_table, TRUE);
if (pop3_state->error_val == PS_AUTHFAIL &&
pop3_state->ac_prefs->tmp_pass) {
num++;
}
- if (error_num && !prefs_common.noerrorpanel) {
+ if (error_num && !prefs_common.no_recv_err_panel) {
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
NULL, NULL);
gchar *buf;
static AtmHandler handlers[] = {
pop3_greeting_recv ,
+#if USE_SSL
+ pop3_stls_send , pop3_stls_recv,
+#endif
pop3_getauth_user_send , pop3_getauth_user_recv,
pop3_getauth_pass_send , pop3_getauth_pass_recv,
pop3_getauth_apop_send , pop3_getauth_apop_recv,
pop3_logout_send , pop3_logout_recv
};
- debug_print(_("getting new messages of account %s...\n"),
+ debug_print("getting new messages of account %s...\n",
pop3_state->ac_prefs->account_name);
atm = automaton_create(N_POP3_PHASE);
for (i = POP3_GREETING_RECV; i < N_POP3_PHASE; i++)
atm->state[i].handler = handlers[i];
atm->state[POP3_GREETING_RECV].condition = GDK_INPUT_READ;
- for (i = POP3_GETAUTH_USER_SEND; i < N_POP3_PHASE; ) {
+ for (i = POP3_GREETING_RECV + 1; i < N_POP3_PHASE; ) {
atm->state[i++].condition = GDK_INPUT_WRITE;
atm->state[i++].condition = GDK_INPUT_READ;
}
#if USE_SSL
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport :
- pop3_state->ac_prefs->ssl_pop ? 995 : 110;
+ pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
#else
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport : 110;
if ((sockinfo = sock_connect(server, port)) == NULL) {
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
server, port);
- if(!prefs_common.noerrorpanel) {
+ if(!prefs_common.no_recv_err_panel) {
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);
}
#if USE_SSL
- if (pop3_state->ac_prefs->ssl_pop && !ssl_init_socket(sockinfo)) {
+ if (pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL &&
+ !ssl_init_socket(sockinfo)) {
pop3_automaton_terminate(NULL, atm);
automaton_destroy(atm);
return INC_CONNECT_ERROR;
atm->help_sock = sockinfo;
log_verbosity_set(TRUE);
+ /* oha: this messes up inc_progress update:
+ disabling this would avoid the label "Retrieve Header"
+ being overwritten by "Retrieve Message"
+ Setting inc_pop3_recv_func is not necessary
+ since atm already handles the progress dialog ui
+ just fine.
+ */
recv_set_ui_func(inc_pop3_recv_func, session);
atm->tag = sock_gdk_input_add(sockinfo,
gtk_main_iteration();
log_verbosity_set(FALSE);
+ /* oha: see above */
recv_set_ui_func(NULL, NULL);
automaton_destroy(atm);
gchar *path;
FILE *fp;
gchar buf[IDLEN + 3];
- GDate curdate;
- gchar **data;
+ gchar uidl[IDLEN + 3];
+ time_t recv_time;
+ time_t now;
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "uidl-", ac_prefs->recv_server,
+ "uidl", G_DIR_SEPARATOR_S, ac_prefs->recv_server,
"-", ac_prefs->userid, NULL);
-
if ((fp = fopen(path, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
g_free(path);
- return NULL;
- }
- g_free(path);
+ path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ "uidl-", ac_prefs->recv_server,
+ "-", ac_prefs->userid, NULL);
+ if ((fp = fopen(path, "rb")) == NULL) {
+ if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
+ g_free(path);
+ return NULL;
+ }
+ g_free(path);
+ } else
+ g_free(path);
table = g_hash_table_new(g_str_hash, g_str_equal);
- g_date_clear(&curdate, 1);
-
- /*
- * NOTE: g_date_set_time() has to be called inside this
- * loop, because a day change may happen??? That right?
- */
+ now = time(NULL);
while (fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
-
- /* data[0] will contain uidl
- * data[1] will contain day of retrieval */
-
- /*
- * FIXME: convoluted implementation. need to find
- * a better way to split the string.
- */
- if (strchr(buf, '\t')) {
- data = g_strsplit(buf, "\t", 2);
- if (data) {
- g_hash_table_insert(table, g_strdup(data[0]), g_strdup(data[1]));
- g_strfreev(data);
- }
- } else {
- g_date_set_time(&curdate, time(NULL));
- g_hash_table_insert(table, g_strdup(buf),
- g_strdup_printf("%d", g_date_day_of_year(&curdate)));
- }
+ recv_time = 0;
+ if (sscanf(buf, "%s\t%ld", uidl, &recv_time) != 2) {
+ if (sscanf(buf, "%s", uidl) != 1)
+ continue;
+ else
+ recv_time = now;
+ }
+ if (recv_time == 0)
+ recv_time = 1;
+ g_hash_table_insert(table, g_strdup(uidl),
+ GINT_TO_POINTER(recv_time));
}
fclose(fp);
{
gchar *path;
FILE *fp;
+ Pop3MsgInfo *msg;
gint n;
- GDate curdate;
- const char *sdate;
- int tdate;
- if (!state->uidl_is_valid)
- return;
-
+ if (!state->uidl_is_valid) return;
+
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "uidl-", state->ac_prefs->recv_server,
- "-", state->user, NULL);
+ "uidl", G_DIR_SEPARATOR_S,
+ state->ac_prefs->recv_server,
+ "-", state->ac_prefs->userid, NULL);
if ((fp = fopen(path, "wb")) == NULL) {
FILE_OP_ERROR(path, "fopen");
g_free(path);
return;
}
- g_date_clear(&curdate, 1);
-
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('\t', fp) == EOF) {
- FILE_OP_ERROR(path, "fputc");
- break;
- }
-
- /*
- * NOTE: need to set time to watch for day changes??
- */
- g_date_set_time(&curdate, time(NULL));
-
- if (NULL != (sdate = g_hash_table_lookup(state->uidl_table, state->msg[n].uidl))) {
- tdate = sdate != NULL ? atoi(sdate) : g_date_day_of_year(&curdate);
- if (fprintf(fp, "%3d", tdate) == EOF) {
- FILE_OP_ERROR(path, "fprintf");
- break;
- }
- } else {
- if (fprintf(fp, "%d", g_date_day_of_year(&curdate)) == EOF) {
- FILE_OP_ERROR(path, "fputs");
- break;
- }
- }
-
- if (fputc('\n', fp) == EOF) {
- FILE_OP_ERROR(path, "fputc");
- break;
- }
- }
+ msg = &state->msg[n];
+ if (msg->uidl && msg->received && !msg->deleted)
+ fprintf(fp, "%s\t%ld\n", msg->uidl, msg->recv_time);
}
- if (fclose(fp) == EOF)
- FILE_OP_ERROR(path, "fclose");
+ if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");
g_free(path);
}
(gfloat)(state->cur_total_bytes) /
(gfloat)(state->total_bytes));
break;
-#if 0
case POP3_DELETE_SEND:
- progress_dialog_set_label(dialog, _("Deleting message"));
+ if (state->msg[state->cur_msg].recv_time < state->current_time) {
+ g_snprintf(buf, sizeof(buf), _("Deleting message %d"),
+ state->cur_msg);
+ progress_dialog_set_label(dialog, buf);
+ }
break;
-#endif
case POP3_LOGOUT_SEND:
progress_dialog_set_label(dialog, _("Quitting"));
break;
(state->folder_table, dropfolder));
if (val == 0) {
folder_item_scan(dropfolder);
+ /* force updating */
+ if (FOLDER_IS_LOCAL(dropfolder->folder))
+ dropfolder->mtime = 0;
g_hash_table_insert(state->folder_table, dropfolder,
GINT_TO_POINTER(1));
}
{
switch (istate) {
case INC_ERROR:
- if(!prefs_common.noerrorpanel) {
- alertpanel_error(_("Error occurred while processing mail."));
- }
+ if (!prefs_common.no_recv_err_panel)
+ alertpanel_error
+ (_("Error occurred while processing mail."));
break;
case INC_NOSPACE:
alertpanel_error(_("No disk space left."));
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 (!list) return;
for (; list != NULL; list = list->next) {
- IncSession *session;
PrefsAccount *account = list->data;
if ((account->protocol == A_LOCAL) &&
g_return_val_if_fail(mbox != NULL, -1);
if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
- debug_print(_("no messages in local mailbox.\n"));
+ debug_print("no messages in local mailbox.\n");
return 0;
} else if (size < 0)
return -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);
+ g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%08x",
+ get_tmp_dir(), G_DIR_SEPARATOR, (gint)mbox);
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"),
+ debug_print("Getting new messages from %s into %s...\n",
mbox, dest->path);
if (prefs_common.filter_on_inc)
if (!prefs_common.scan_all_after_inc) {
g_hash_table_insert(folder_table, dest,
GINT_TO_POINTER(1));
- folder_item_scan_foreach(folder_table);
- folderview_update_item_foreach(folder_table);
+ folderview_update_item_foreach(folder_table, TRUE);
}
g_hash_table_destroy(folder_table);
} else if (!prefs_common.scan_all_after_inc) {
- folder_item_scan(dest);
- folderview_update_item(dest, FALSE);
+ folderview_update_item(dest, TRUE);
}
return msgs;
projects / claws.git / blobdiff