#include "utils.h"
#include "gtkutils.h"
#include "statusbar.h"
+#include "msgcache.h"
#include "manage_window.h"
#include "stock_pixmap.h"
#include "progressdialog.h"
gpointer data);
static gint get_spool (FolderItem *dest,
- const gchar *mbox);
+ const gchar *mbox,
+ PrefsAccount *account);
static gint inc_spool_account(PrefsAccount *account);
static gint inc_all_spool(void);
inc_autocheck_timer_set();
}
+static void inc_progress_dialog_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.receivewin_width = allocation->width;
+ prefs_common.receivewin_height = allocation->height;
+}
+
static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
{
IncProgressDialog *dialog;
ProgressDialog *progress;
+ static GdkGeometry geometry;
dialog = g_new0(IncProgressDialog, 1);
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)); */
+ g_signal_connect(G_OBJECT(progress->window), "size_allocate",
+ G_CALLBACK(inc_progress_dialog_size_allocate_cb), NULL);
+ /* manage_window_set_transient(GTK_WINDOW(progress->window)); */
progress_dialog_get_fraction(progress);
stock_pixbuf_gdk(progress->treeview, STOCK_PIXMAP_ERROR,
&errorpix);
+ if (!geometry.min_height) {
+ geometry.min_width = 460;
+ geometry.min_height = 250;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(progress->window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(progress->window, prefs_common.receivewin_width,
+ prefs_common.receivewin_height);
+
if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
(prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL &&
!autocheck)) {
gchar *msg;
gchar *fin_msg;
FolderItem *processing, *inbox;
- MsgInfo *msginfo;
GSList *msglist, *msglist_element;
gboolean cancelled = FALSE;
}
for (; inc_dialog->queue_list != NULL && !cancelled; inc_dialog->cur_row++) {
- int cur = 0, total = 0;
session = inc_dialog->queue_list->data;
pop3_session = POP3_SESSION(session->session);
+ GSList *filtered, *unfiltered;
if (pop3_session->pass == NULL) {
SET_PIXMAP_AND_TEXT(okpix, _("Cancelled"));
/* process messages */
folder_item_update_freeze();
- if (pop3_session->ac_prefs->filter_on_recv)
- statusbar_print_all(_("Filtering messages...\n"));
- total = g_slist_length(msglist);
-
- for(msglist_element = msglist; msglist_element != NULL;
- msglist_element = msglist_element->next) {
- gchar *filename;
- msginfo = (MsgInfo *) msglist_element->data;
- filename = folder_item_fetch_msg(processing, msginfo->msgnum);
- g_free(filename);
+
+ procmsg_msglist_filter(msglist, pop3_session->ac_prefs,
+ &filtered, &unfiltered,
+ pop3_session->ac_prefs->filter_on_recv);
- if (pop3_session->ac_prefs->filter_on_recv)
- statusbar_progress_all(cur++,total, prefs_common.statusbar_update_step);
+ if (filtered != NULL)
+ filtering_move_and_copy_msgs(filtered);
+ if (unfiltered != NULL)
+ folder_item_move_msgs(inbox, unfiltered);
- if (!pop3_session->ac_prefs->filter_on_recv ||
- !procmsg_msginfo_filter(msginfo))
- folder_item_move_msg(inbox, msginfo);
- }
- filtering_move_and_copy_msgs(msglist);
for(msglist_element = msglist; msglist_element != NULL;
msglist_element = msglist_element->next) {
MsgInfo *msginfo = (MsgInfo *)msglist_element->data;
}
folder_item_update_thaw();
- statusbar_progress_all(0,0,0);
- statusbar_pop_all();
-
g_slist_free(msglist);
+ g_slist_free(filtered);
+ g_slist_free(unfiltered);
statusbar_pop_all();
inc_state == INC_IO_ERROR)
break;
}
+ folder_item_free_cache(processing, TRUE);
inc_session_destroy(session);
inc_dialog->queue_list =
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
- _("Con_tinue connecting"),
- GTK_STOCK_CANCEL, NULL,
- FALSE, NULL, ALERT_WARNING,
- G_ALERTALTERNATE) != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("Con_tinue connecting"),
+ NULL, FALSE, NULL, ALERT_WARNING,
+ G_ALERTDEFAULT) != G_ALERTALTERNATE)
return INC_CANCEL;
}
port = pop3_session->ac_prefs->set_popport ?
#endif
buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
+ statusbar_print_all("%s", buf);
log_message("%s\n", buf);
progress_dialog_set_label(inc_dialog->dialog, buf);
+ GTK_EVENTS_FLUSH();
g_free(buf);
session_set_timeout(SESSION(pop3_session),
prefs_common.io_timeout_secs * 1000);
-
+
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_MANUAL) && focus_window)) {
alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
server, port);
manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+ } else {
+ log_error(_("Can't connect to POP3 server: %s:%d\n"),
+ server, port);
}
session->inc_state = INC_CONNECT_ERROR;
statusbar_pop_all();
case POP3_GETAUTH_PASS:
case POP3_GETAUTH_APOP:
progress_dialog_set_label(dialog, _("Authenticating..."));
+ statusbar_pop_all();
statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
SESSION(session)->server,
session->ac_prefs->account_name);
}
progress_dialog_set_fraction
- (inc_dialog->dialog,(gfloat)cur_total / (gfloat)total);
+ (inc_dialog->dialog, (total == 0) ? 0: (gfloat)cur_total / (gfloat)total);
g_snprintf(buf, sizeof(buf), "%d / %d",
pop3_session->cur_msg, pop3_session->count);
(GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), buf);
gtk_progress_bar_set_fraction
(GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (gfloat)cur_total / (gfloat)total);
+ (total == 0) ? 0 : (gfloat)cur_total / (gfloat)total);
if (pop3_session->cur_total_num > 0) {
g_snprintf(buf, sizeof(buf),
switch (istate) {
case INC_CONNECT_ERROR:
log_msg = _("Connection failed.");
+ fatal_error = TRUE;
if (prefs_common.no_recv_err_panel)
break;
err_msg = g_strdup_printf(_("Connection to %s:%d failed."),
break;
case INC_ERROR:
log_msg = _("Error occurred while processing mail.");
+ fatal_error = TRUE;
if (prefs_common.no_recv_err_panel)
break;
if (session->error_msg)
break;
case INC_AUTH_FAILED:
log_msg = _("Authentication failed.");
+ fatal_error = TRUE;
if (prefs_common.no_recv_err_panel)
break;
if (session->error_msg)
else
log_warning("%s\n", log_msg);
}
+ if (prefs_common.no_recv_err_panel && fatal_error)
+ mainwindow_show_error();
+
if (err_msg) {
alertpanel_error_log(err_msg);
g_free(err_msg);
return -1;
}
- result = get_spool(inbox, mbox);
+ result = get_spool(inbox, mbox, account);
g_free(mbox);
statusbar_pop_all();
return new_msgs;
}
-static gint get_spool(FolderItem *dest, const gchar *mbox)
+static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account)
{
gint msgs, size;
gint lockfd;
debug_print("Getting new messages from %s into %s...\n",
mbox, dest->path);
- msgs = proc_mbox(dest, tmp_mbox, TRUE);
+ msgs = proc_mbox(dest, tmp_mbox, TRUE, account);
g_unlink(tmp_mbox);
if (msgs >= 0) empty_mbox(mbox);
projects / claws.git / blobdiff