static gint inc_account_mail (PrefsAccount *account,
MainWindow *mainwin);
-static IncProgressDialog *inc_progress_dialog_create (void);
+static IncProgressDialog *inc_progress_dialog_create
+ (gboolean autocheck);
static void inc_progress_dialog_set_list(IncProgressDialog *inc_dialog);
static void inc_progress_dialog_destroy (IncProgressDialog *inc_dialog);
static void inc_notify_cmd (gint new_msgs,
gboolean notify);
-
-#define FOLDER_SUMMARY_MISMATCH(f, s) \
- (f) && (s) ? ((s)->newmsgs != (f)->new_msgs) || ((f)->unread_msgs != (s)->unread) || ((f)->total_msgs != (s)->messages) \
- : FALSE
/**
* inc_finished:
item = cur_account && cur_account->inbox
? folder_find_item_from_identifier(cur_account->inbox)
: folder_get_default_inbox();
- if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
- folderview_unselect(mainwin->folderview);
- folderview_select(mainwin->folderview, item);
- }
}
}
void inc_pop_before_smtp(PrefsAccount *acc)
{
- inc_account_mail(acc, NULL);
+ /* FIXME: assumes to attach to first main window */
+ inc_account_mail(acc, mainwindow_get_mainwindow());
}
static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
session = inc_session_new(account);
if (!session) return 0;
- inc_dialog = inc_progress_dialog_create();
+ inc_dialog = inc_progress_dialog_create(FALSE);
inc_dialog->queue_list = g_list_append(inc_dialog->queue_list,
session);
inc_dialog->mainwin = mainwin;
return 0;
}
-void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
+void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
+ gboolean notify)
{
GList *list, *queue_list = NULL;
IncProgressDialog *inc_dialog;
return;
}
- inc_dialog = inc_progress_dialog_create();
+ inc_dialog = inc_progress_dialog_create(autocheck);
inc_dialog->queue_list = queue_list;
inc_dialog->mainwin = mainwin;
inc_progress_dialog_set_list(inc_dialog);
inc_autocheck_timer_set();
}
-static IncProgressDialog *inc_progress_dialog_create(void)
+static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
{
IncProgressDialog *dialog;
ProgressDialog *progress;
progress = progress_dialog_create();
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_cb), dialog);
- gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
- GTK_SIGNAL_FUNC(inc_dialog_delete_cb), dialog);
+ g_signal_connect(G_OBJECT(progress->cancel_btn), "clicked",
+ G_CALLBACK(inc_cancel_cb), dialog);
+ g_signal_connect(G_OBJECT(progress->window), "delete_event",
+ G_CALLBACK(inc_dialog_delete_cb), dialog);
/* manage_window_set_transient(GTK_WINDOW(progress->window)); */
progress_dialog_set_value(progress, 0.0);
&errorxpm, &errorxpmmask);
if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
- (prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE &&
- manage_window_get_focus_window())) {
+ (prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL &&
+ !autocheck)) {
dialog->show_dialog = TRUE;
gtk_widget_show_now(progress->window);
}
dialog->dialog = progress;
dialog->queue_list = NULL;
+ dialog->cur_row = 0;
inc_dialog_list = g_list_append(inc_dialog_list, dialog);
progress_dialog_set_value(inc_dialog->dialog, 0.0);
progress_dialog_set_label(inc_dialog->dialog, "");
if (inc_dialog->mainwin)
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+ gtk_progress_set_show_text
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
}
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);
+
if (inc_dialog->mainwin)
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+ gtk_progress_set_show_text
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+
progress_dialog_destroy(inc_dialog->dialog);
g_free(inc_dialog);
GList *qlist;
Pop3Session *pop3_session;
IncState inc_state;
- gint num = 0;
gint error_num = 0;
gint new_msgs = 0;
gchar *msg;
qlist = next;
}
- for (; inc_dialog->queue_list != NULL; num++) {
+#define SET_PIXMAP_AND_TEXT(xpm, xpmmask, str) \
+{ \
+ gtk_clist_set_pixmap(clist, inc_dialog->cur_row, 0, xpm, xpmmask); \
+ gtk_clist_set_text(clist, inc_dialog->cur_row, 2, str); \
+}
+
+ for (; inc_dialog->queue_list != NULL; inc_dialog->cur_row++) {
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"));
+ SET_PIXMAP_AND_TEXT(okxpm, okxpmmask, _("Cancelled"));
inc_session_destroy(session);
inc_dialog->queue_list =
g_list_remove(inc_dialog->queue_list, session);
}
inc_progress_dialog_clear(inc_dialog);
- gtk_clist_moveto(clist, num, -1, 1.0, 0.0);
+ gtk_clist_moveto(clist, inc_dialog->cur_row, -1, 1.0, 0.0);
- gtk_clist_set_pixmap(clist, num, 0, currentxpm, currentxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Retrieving"));
+ SET_PIXMAP_AND_TEXT(currentxpm, currentxpmmask,
+ _("Retrieving"));
session_set_recv_message_notify(session->session,
inc_recv_message, session);
to_human_readable(pop3_session->cur_total_recv_bytes));
else
msg = g_strdup_printf(_("Done (no new messages)"));
- gtk_clist_set_pixmap(clist, num, 0, okxpm, okxpmmask);
- gtk_clist_set_text(clist, num, 2, msg);
+ SET_PIXMAP_AND_TEXT(okxpm, okxpmmask, msg);
g_free(msg);
break;
case INC_CONNECT_ERROR:
- gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Connection failed"));
+ SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask,
+ _("Connection failed"));
break;
case INC_AUTH_FAILED:
- gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Auth failed"));
+ SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask,
+ _("Auth failed"));
break;
case INC_LOCKED:
- gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Locked"));
+ SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask,
+ _("Locked"));
break;
case INC_ERROR:
case INC_NO_SPACE:
case INC_IO_ERROR:
case INC_SOCKET_ERROR:
- gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Error"));
+ case INC_EOF:
+ SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask, _("Error"));
break;
case INC_CANCEL:
- gtk_clist_set_pixmap(clist, num, 0, okxpm, okxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Cancelled"));
+ SET_PIXMAP_AND_TEXT(okxpm, okxpmmask, _("Cancelled"));
break;
default:
break;
if (pop3_session->error_val == PS_AUTHFAIL) {
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)) {
+ ((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window)) {
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
}
alertpanel_error
folder_item_update_thaw();
+ statusbar_pop_all();
new_msgs += pop3_session->cur_total_num;
g_list_remove(inc_dialog->queue_list, session);
}
+#undef SET_PIXMAP_AND_TEXT
+
if (new_msgs > 0)
fin_msg = g_strdup_printf(_("Finished (%d new message(s))"),
new_msgs);
pop3_session->ac_prefs->popport :
pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
SESSION(pop3_session)->ssl_type = pop3_session->ac_prefs->ssl_pop;
+ if (pop3_session->ac_prefs->ssl_pop != SSL_NONE)
+ SESSION(pop3_session)->nonblocking =
+ pop3_session->ac_prefs->use_nonblocking_ssl;
#else
port = pop3_session->ac_prefs->set_popport ?
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"),
server, port);
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)) {
+ ((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window)) {
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
}
alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
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 &&
+ while (session_is_connected(SESSION(pop3_session)) &&
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:
session->inc_state = INC_CONNECT_ERROR;
else
session->inc_state = INC_ERROR;
- } else
+ } else if (SESSION(pop3_session)->state == SESSION_EOF)
+ session->inc_state = INC_EOF;
+ else
session->inc_state = INC_SUCCESS;
break;
case PS_AUTHFAIL:
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(session), 0,
session->msg[session->cur_msg].size,
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;
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;
+ Pop3Session *pop3_session = POP3_SESSION(session);
IncProgressDialog *inc_dialog;
+ gchar *msg;
g_return_val_if_fail(inc_session != NULL, -1);
inc_recv_data_progressive(session, 0, len, inc_session);
inc_progress_dialog_set_label(inc_dialog, inc_session);
+ if (pop3_session->cur_total_num == 0) return 0;
+
+ msg = g_strdup_printf(_("Retrieving (%d message(s) (%s) received)"),
+ pop3_session->cur_total_num,
+ to_human_readable
+ (pop3_session->cur_total_recv_bytes));
+ gtk_clist_set_text(GTK_CLIST(inc_dialog->dialog->clist),
+ inc_dialog->cur_row, 2, msg);
+ g_free(msg);
+
return 0;
}
dropfolder = folder_get_default_processing();
/* add msg file to drop folder */
- if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
+ if ((msgnum = folder_item_add_msg(dropfolder, file, NULL, TRUE)) < 0) {
unlink(file);
return -1;
}
static void inc_put_error(IncState istate, const gchar *msg)
{
+ gchar *log_msg = NULL;
+ gchar *err_msg = NULL;
+ gboolean fatal_error = FALSE;
+
switch (istate) {
case INC_CONNECT_ERROR:
+ log_msg = _("Connection failed.");
if (prefs_common.no_recv_err_panel)
break;
- alertpanel_error(_("Connection failed."));
+ err_msg = g_strdup(log_msg);
break;
case INC_ERROR:
+ log_msg = _("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);
+ err_msg = g_strdup_printf
+ (_("Error occurred while processing mail:\n%s"),
+ msg);
else
- alertpanel_error(_("Error occurred while processing mail."));
+ err_msg = g_strdup(log_msg);
break;
case INC_NO_SPACE:
- alertpanel_error(_("No disk space left."));
+ log_msg = _("No disk space left.");
+ err_msg = g_strdup(log_msg);
+ fatal_error = TRUE;
break;
case INC_IO_ERROR:
- alertpanel_error(_("Can't write file."));
+ log_msg = _("Can't write file.");
+ err_msg = g_strdup(log_msg);
+ fatal_error = TRUE;
break;
case INC_SOCKET_ERROR:
+ log_msg = _("Socket error.");
+ if (prefs_common.no_recv_err_panel)
+ break;
+ err_msg = g_strdup(log_msg);
+ break;
+ case INC_EOF:
+ log_msg = _("Connection closed by the remote host.");
if (prefs_common.no_recv_err_panel)
break;
- alertpanel_error(_("Socket error."));
+ err_msg = g_strdup(log_msg);
break;
case INC_LOCKED:
+ log_msg = _("Mailbox is locked.");
if (prefs_common.no_recv_err_panel)
break;
if (msg)
- alertpanel_error(_("Mailbox is locked:\n%s"), msg);
+ err_msg = g_strdup_printf(_("Mailbox is locked:\n%s"),
+ msg);
else
- alertpanel_error(_("Mailbox is locked."));
+ err_msg = g_strdup(log_msg);
break;
case INC_AUTH_FAILED:
+ log_msg = _("Authentication failed.");
if (prefs_common.no_recv_err_panel)
break;
if (msg)
- alertpanel_error(_("Authentication failed:\n%s"),
- msg);
+ err_msg = g_strdup_printf
+ (_("Authentication failed:\n%s"), msg);
else
- alertpanel_error(_("Authentication failed."));
+ err_msg = g_strdup(log_msg);
break;
default:
break;
}
+
+ if (log_msg) {
+ if (fatal_error)
+ log_error("%s\n", log_msg);
+ else
+ log_warning("%s\n", log_msg);
+ }
+ if (err_msg) {
+ alertpanel_error_log(err_msg);
+ g_free(err_msg);
+ }
}
static void inc_cancel(IncProgressDialog *dialog)
static gint inc_spool(void)
{
- gchar *mbox, *logname;
+ gchar *mbox;
+ const gchar *logname;
gint msgs;
logname = g_get_user_name();
return FALSE;
}
- inc_all_account_mail(mainwin, prefs_common.newmail_notify_auto);
+ inc_all_account_mail(mainwin, TRUE, prefs_common.newmail_notify_auto);
return FALSE;
}
projects / claws.git / blobdiff