/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
MainWindow *mainwin);
static IncProgressDialog *inc_progress_dialog_create (void);
+static void inc_progress_dialog_set_list(IncProgressDialog *inc_dialog);
static void inc_progress_dialog_destroy (IncProgressDialog *inc_dialog);
static IncSession *inc_session_new (PrefsAccount *account);
static gint inc_start (IncProgressDialog *inc_dialog);
static IncState inc_pop3_session_do (IncSession *session);
+static void inc_progress_dialog_set_label
+ (IncProgressDialog *inc_dialog,
+ IncSession *inc_session);
+
static gint inc_recv_data_progressive (Session *session,
guint cur_len,
guint total_len,
const gchar *msg,
gpointer data);
-static void inc_put_error (IncState istate);
+static void inc_put_error (IncState istate,
+ const gchar *msg);
static void inc_cancel_cb (GtkWidget *widget,
gpointer data);
if (account_new_msgs > 0)
new_msgs += account_new_msgs;
}
- cur_account->session = STYPE_NORMAL;
+
account_new_msgs = inc_account_mail(cur_account, mainwin);
if (account_new_msgs > 0)
new_msgs += account_new_msgs;
void inc_pop_before_smtp(PrefsAccount *acc)
{
- acc->session = STYPE_POP_BEFORE_SMTP;
inc_account_mail(acc, NULL);
}
{
IncProgressDialog *inc_dialog;
IncSession *session;
- gchar *text[3];
FolderItem *item = NULL;
if(mainwin && mainwin->summaryview)
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);
-
+ inc_progress_dialog_set_list(inc_dialog);
+
if (mainwin) {
toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
for (list = account_get_list(); list != NULL; list = list->next) {
IncSession *session;
PrefsAccount *account = list->data;
- account->session = STYPE_NORMAL;
+
if (account->recv_at_getall) {
session = inc_session_new(account);
if (session)
inc_dialog = inc_progress_dialog_create();
inc_dialog->queue_list = queue_list;
inc_dialog->mainwin = mainwin;
- for (list = queue_list; list != NULL; list = list->next) {
- IncSession *session = list->data;
- Pop3Session *pop3_session = POP3_SESSION(session->session);
- gchar *text[3];
-
- session->data = inc_dialog;
-
- text[0] = NULL;
- text[1] = pop3_session->ac_prefs->account_name;
- text[2] = _("Standby");
- gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
- }
+ inc_progress_dialog_set_list(inc_dialog);
toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
return dialog;
}
+static void inc_progress_dialog_set_list(IncProgressDialog *inc_dialog)
+{
+ GList *list;
+
+ for (list = inc_dialog->queue_list; list != NULL; list = list->next) {
+ IncSession *session = list->data;
+ Pop3Session *pop3_session = POP3_SESSION(session->session);
+ gchar *text[3];
+
+ session->data = inc_dialog;
+
+ text[0] = NULL;
+ text[1] = pop3_session->ac_prefs->account_name;
+ text[2] = _("Standby");
+ gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
+ }
+}
+
static void inc_progress_dialog_clear(IncProgressDialog *inc_dialog)
{
progress_dialog_set_value(inc_dialog->dialog, 0.0);
progress_dialog_set_label(inc_dialog->dialog, "");
+ gtk_progress_set_show_text
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
if (inc_dialog->mainwin)
gtk_progress_bar_update
(GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
g_return_if_fail(inc_dialog != NULL);
inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
+
+ gtk_progress_set_show_text
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
if (inc_dialog->mainwin)
gtk_progress_bar_update
(GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
{
IncSession *session;
GtkCList *clist = GTK_CLIST(inc_dialog->dialog->clist);
+ GList *qlist;
Pop3Session *pop3_session;
IncState inc_state;
gint num = 0;
MsgInfo *msginfo;
GSList *msglist, *msglist_element;
- while (inc_dialog->queue_list != NULL) {
- session = inc_dialog->queue_list->data;
- pop3_session = POP3_SESSION(session->session);
-
- inc_progress_dialog_clear(inc_dialog);
-
- gtk_clist_moveto(clist, num, -1, 1.0, 0.0);
+ qlist = inc_dialog->queue_list;
+ while (qlist != NULL) {
+ GList *next = qlist->next;
+ session = qlist->data;
+ pop3_session = POP3_SESSION(session->session);
pop3_session->user = g_strdup(pop3_session->ac_prefs->userid);
if (pop3_session->ac_prefs->passwd)
pop3_session->pass =
else {
gchar *pass;
+ if (inc_dialog->show_dialog)
+ manage_window_focus_in
+ (inc_dialog->dialog->window,
+ NULL, NULL);
+
pass = input_dialog_query_password
(pop3_session->ac_prefs->recv_server,
pop3_session->user);
- if (inc_dialog->mainwin && inc_dialog->show_dialog)
- manage_window_focus_in
- (inc_dialog->mainwin->window,
+ if (inc_dialog->show_dialog)
+ manage_window_focus_out
+ (inc_dialog->dialog->window,
NULL, NULL);
+
if (pass) {
pop3_session->ac_prefs->tmp_pass =
g_strdup(pass);
pop3_session->pass = pass;
- } else {
- inc_session_destroy(session);
- inc_dialog->queue_list = g_list_remove
- (inc_dialog->queue_list, session);
- continue;
}
}
+ qlist = next;
+ }
+
+ for (; inc_dialog->queue_list != NULL; num++) {
+ session = inc_dialog->queue_list->data;
+ pop3_session = POP3_SESSION(session->session);
+
+ if (pop3_session->pass == NULL) {
+ gtk_clist_set_pixmap(clist, num, 0, okxpm, okxpmmask);
+ gtk_clist_set_text(clist, num, 2, _("Cancelled"));
+ inc_session_destroy(session);
+ inc_dialog->queue_list =
+ g_list_remove(inc_dialog->queue_list, session);
+ continue;
+ }
+
+ inc_progress_dialog_clear(inc_dialog);
+ gtk_clist_moveto(clist, num, -1, 1.0, 0.0);
+
gtk_clist_set_pixmap(clist, num, 0, currentxpm, currentxpmmask);
gtk_clist_set_text(clist, num, 2, _("Retrieving"));
folder_item_update_thaw();
+ statusbar_pop_all();
new_msgs += pop3_session->cur_total_num;
if (inc_state != INC_SUCCESS && inc_state != INC_CANCEL) {
error_num++;
- if (inc_state == INC_ERROR ||
- inc_state == INC_IO_ERROR ||
- inc_state == INC_SOCKET_ERROR) {
- inc_put_error(inc_state);
- } else if (inc_state == INC_NO_SPACE) {
- inc_put_error(inc_state);
+ if (inc_dialog->show_dialog)
+ manage_window_focus_in
+ (inc_dialog->dialog->window,
+ NULL, NULL);
+ inc_put_error(inc_state, pop3_session->error_msg);
+ if (inc_dialog->show_dialog)
+ manage_window_focus_out
+ (inc_dialog->dialog->window,
+ NULL, NULL);
+ if (inc_state == INC_NO_SPACE ||
+ inc_state == INC_IO_ERROR)
break;
- }
}
inc_session_destroy(session);
inc_dialog->queue_list =
g_list_remove(inc_dialog->queue_list, session);
-
- num++;
}
if (new_msgs > 0)
progress_dialog_set_label(inc_dialog->dialog, fin_msg);
+#if 0
if (error_num && !prefs_common.no_recv_err_panel) {
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
manage_window_focus_out(inc_dialog->dialog->window,
NULL, NULL);
}
+#endif
while (inc_dialog->queue_list != NULL) {
session = inc_dialog->queue_list->data;
debug_print("getting new messages of account %s...\n",
pop3_session->ac_prefs->account_name);
+
+ pop3_session->ac_prefs->last_pop_login_time = time(NULL);
buf = g_strdup_printf(_("%s: Retrieving new messages"),
pop3_session->ac_prefs->recv_server);
pop3_session->ac_prefs->popport : 110;
#endif
- statusbar_verbosity_set(TRUE);
- buf = g_strdup_printf(_("Connecting to POP3 server: %s ..."), server);
+ buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
log_message("%s\n", buf);
progress_dialog_set_label(inc_dialog->dialog, buf);
g_free(buf);
GTK_EVENTS_FLUSH();
- statusbar_verbosity_set(FALSE);
if (session_connect(SESSION(pop3_session), server, port) < 0) {
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
}
session->inc_state = INC_CONNECT_ERROR;
+ statusbar_pop_all();
return INC_CONNECT_ERROR;
}
- statusbar_verbosity_set(TRUE);
-
while (SESSION(pop3_session)->state != SESSION_DISCONNECTED &&
- SESSION(pop3_session)->state != SESSION_ERROR)
+ SESSION(pop3_session)->state != SESSION_ERROR &&
+ session->inc_state != INC_CANCEL)
gtk_main_iteration();
+ statusbar_pop_all();
- statusbar_verbosity_set(FALSE);
if (session->inc_state == INC_SUCCESS) {
switch (pop3_session->error_val) {
case PS_SUCCESS:
return session->inc_state;
}
-static gint inc_recv_data_progressive(Session *session, guint cur_len,
- guint total_len, gpointer data)
+static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
+ IncSession *inc_session)
{
gchar buf[MSGBUFSIZE];
- IncSession *inc_session = (IncSession *)data;
- Pop3Session *pop3_session = POP3_SESSION(session);
- IncProgressDialog *inc_dialog = (IncProgressDialog *)inc_session->data;
ProgressDialog *dialog = inc_dialog->dialog;
- gint cur_total;
- gchar *total_size;
+ Pop3Session *session;
- cur_total = pop3_session->cur_total_bytes + cur_len;
- if (cur_total > pop3_session->total_bytes)
- cur_total = pop3_session->total_bytes;
+ g_return_if_fail(inc_session != NULL);
- Xstrdup_a(total_size, to_human_readable(pop3_session->total_bytes),
- return FALSE);
- g_snprintf(buf, sizeof(buf),
- _("Retrieving message (%d / %d) (%s / %s)"),
- pop3_session->cur_msg, pop3_session->count,
- to_human_readable(cur_total), total_size);
- progress_dialog_set_label(dialog, buf);
- progress_dialog_set_percentage
- (dialog, (gfloat)cur_total / (gfloat)pop3_session->total_bytes);
- if (inc_dialog->mainwin)
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (gfloat)cur_total / (gfloat)pop3_session->total_bytes);
- GTK_EVENTS_FLUSH();
-
- return 0;
-}
-
-static gint inc_recv_data_finished(Session *session, guint len, gpointer data)
-{
- inc_recv_data_progressive(session, 0, len, data);
- return 0;
-}
-
-static gint inc_recv_message(Session *session, const gchar *msg, gpointer data)
-{
- gchar buf[MSGBUFSIZE];
- IncSession *inc_session = (IncSession *)data;
- Pop3Session *pop3_session = POP3_SESSION(session);
- IncProgressDialog *inc_dialog = (IncProgressDialog *)inc_session->data;
- ProgressDialog *dialog = inc_dialog->dialog;
+ session = POP3_SESSION(inc_session->session);
- switch (pop3_session->state) {
+ switch (session->state) {
case POP3_GREETING:
break;
case POP3_GETAUTH_USER:
case POP3_GETAUTH_PASS:
case POP3_GETAUTH_APOP:
progress_dialog_set_label(dialog, _("Authenticating..."));
+ statusbar_print_all(_("Retrieving messages from %s..."),
+ SESSION(session)->server);
break;
case POP3_GETRANGE_STAT:
progress_dialog_set_label
(dialog, _("Getting the size of messages (LIST)..."));
break;
case POP3_RETR:
+ gtk_progress_set_show_text
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), TRUE);
+ g_snprintf(buf, sizeof(buf), "%d / %d",
+ session->cur_msg, session->count);
+ gtk_progress_set_format_string
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), buf);
inc_recv_data_progressive
- (session, 0,
- pop3_session->msg[pop3_session->cur_msg].size, data);
+ (SESSION(session), 0,
+ session->msg[session->cur_msg].size,
+ inc_session);
break;
case POP3_DELETE:
- if (pop3_session->msg[pop3_session->cur_msg].recv_time <
- pop3_session->current_time) {
+ if (session->msg[session->cur_msg].recv_time <
+ session->current_time) {
g_snprintf(buf, sizeof(buf), _("Deleting message %d"),
- pop3_session->cur_msg);
+ session->cur_msg);
progress_dialog_set_label(dialog, buf);
}
break;
default:
break;
}
+}
+
+static gint inc_recv_data_progressive(Session *session, guint cur_len,
+ guint total_len, gpointer data)
+{
+ gchar buf[MSGBUFSIZE];
+ IncSession *inc_session = (IncSession *)data;
+ Pop3Session *pop3_session = POP3_SESSION(session);
+ IncProgressDialog *inc_dialog;
+ ProgressDialog *dialog;
+ gint cur_total;
+ gchar *total_size;
+
+ g_return_val_if_fail(inc_session != NULL, -1);
+
+ if (pop3_session->state != POP3_RETR &&
+ pop3_session->state != POP3_RETR_RECV &&
+ pop3_session->state != POP3_DELETE &&
+ pop3_session->state != POP3_LOGOUT) return 0;
+
+ if (!pop3_session->new_msg_exist) return 0;
+
+ inc_dialog = (IncProgressDialog *)inc_session->data;
+ dialog = inc_dialog->dialog;
+
+ cur_total = pop3_session->cur_total_bytes + cur_len;
+ if (cur_total > pop3_session->total_bytes)
+ cur_total = pop3_session->total_bytes;
+
+ Xstrdup_a(total_size, to_human_readable(pop3_session->total_bytes),
+ return FALSE);
+ g_snprintf(buf, sizeof(buf),
+ _("Retrieving message (%d / %d) (%s / %s)"),
+ pop3_session->cur_msg, pop3_session->count,
+ to_human_readable(cur_total), total_size);
+ progress_dialog_set_label(dialog, buf);
+ progress_dialog_set_percentage
+ (dialog, (gfloat)cur_total / (gfloat)pop3_session->total_bytes);
+ if (inc_dialog->mainwin)
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)cur_total / (gfloat)pop3_session->total_bytes);
+ GTK_EVENTS_FLUSH();
+
+ return 0;
+}
+
+static gint inc_recv_data_finished(Session *session, guint len, gpointer data)
+{
+ IncSession *inc_session = (IncSession *)data;
+ IncProgressDialog *inc_dialog;
+
+ g_return_val_if_fail(inc_session != NULL, -1);
+
+ inc_dialog = (IncProgressDialog *)inc_session->data;
+ inc_recv_data_progressive(session, 0, len, inc_session);
+ inc_progress_dialog_set_label(inc_dialog, inc_session);
+
+ return 0;
+}
+
+static gint inc_recv_message(Session *session, const gchar *msg, gpointer data)
+{
+ IncSession *inc_session = (IncSession *)data;
+ IncProgressDialog *inc_dialog;
+
+ g_return_val_if_fail(inc_session != NULL, -1);
+
+ inc_dialog = (IncProgressDialog *)inc_session->data;
+ inc_progress_dialog_set_label(inc_dialog, inc_session);
return 0;
}
FolderItem *inbox;
FolderItem *dropfolder;
gint msgnum;
- IncSession *inc_session = (IncSession *)(SESSION(session)->data);
- gint val;
if (session->ac_prefs->inbox) {
inbox = folder_find_item_from_identifier
return 0;
}
-static void inc_put_error(IncState istate)
+static void inc_put_error(IncState istate, const gchar *msg)
{
switch (istate) {
+ case INC_CONNECT_ERROR:
+ if (prefs_common.no_recv_err_panel)
+ break;
+ alertpanel_error(_("Connection failed."));
+ break;
case INC_ERROR:
- if (!prefs_common.no_recv_err_panel)
- alertpanel_error
- (_("Error occurred while processing mail."));
+ if (prefs_common.no_recv_err_panel)
+ break;
+ if (msg)
+ alertpanel_error(_("Error occurred while processing mail:\n%s"), msg);
+ else
+ alertpanel_error(_("Error occurred while processing mail."));
break;
case INC_NO_SPACE:
alertpanel_error(_("No disk space left."));
alertpanel_error(_("Can't write file."));
break;
case INC_SOCKET_ERROR:
+ if (prefs_common.no_recv_err_panel)
+ break;
alertpanel_error(_("Socket error."));
break;
case INC_LOCKED:
- if (!prefs_common.no_recv_err_panel)
+ if (prefs_common.no_recv_err_panel)
+ break;
+ if (msg)
+ alertpanel_error(_("Mailbox is locked:\n%s"), msg);
+ else
alertpanel_error(_("Mailbox is locked."));
break;
+ case INC_AUTH_FAILED:
+ if (prefs_common.no_recv_err_panel)
+ break;
+ if (msg)
+ alertpanel_error(_("Authentication failed:\n%s"),
+ msg);
+ else
+ alertpanel_error(_("Authentication failed."));
+ break;
default:
break;
}
session = dialog->queue_list->data;
- session->session->state = SESSION_DISCONNECTED;
session->inc_state = INC_CANCEL;
log_message(_("Incorporation cancelled\n"));