/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
#define MSGBUFSIZE 8192
static void inc_finished (MainWindow *mainwin,
- gboolean new_messages);
+ gboolean new_messages,
+ gboolean autocheck);
static gint inc_account_mail_real (MainWindow *mainwin,
PrefsAccount *account);
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);
* messages. If @new_messages is FALSE, this function avoids unneeded
* updating.
**/
-static void inc_finished(MainWindow *mainwin, gboolean new_messages)
+static void inc_finished(MainWindow *mainwin, gboolean new_messages, gboolean autocheck)
{
- FolderItem *item;
-
if (prefs_common.scan_all_after_inc)
folderview_check_new(NULL);
- if (!new_messages && !prefs_common.scan_all_after_inc) return;
+ if (!autocheck && prefs_common.open_inbox_on_inc) {
+ FolderItem *item = NULL;
+
+ if (cur_account && cur_account->inbox)
+ item = folder_find_item_from_identifier(cur_account->inbox);
+ if (item == NULL && cur_account->folder)
+ item = cur_account->folder->inbox;
+ if (item == NULL)
+ item = folder_get_default_inbox();
- if (prefs_common.open_inbox_on_inc) {
- item = cur_account && cur_account->inbox
- ? folder_find_item_from_identifier(cur_account->inbox)
- : folder_get_default_inbox();
folderview_unselect(mainwin->folderview);
folderview_select(mainwin->folderview, item);
}
if (inc_lock_count) return;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(TRUE,
+ _("Claws Mail needs network access in order "
"to get mails.")))
return;
new_msgs += account_new_msgs;
}
- inc_finished(mainwin, new_msgs > 0);
+ inc_finished(mainwin, new_msgs > 0, FALSE);
main_window_unlock(mainwin);
inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
if (inc_lock_count) return 0;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(TRUE,
+ _("Claws Mail needs network access in order "
"to get mails.")))
return 0;
new_msgs = inc_account_mail_real(mainwin, account);
- inc_finished(mainwin, new_msgs > 0);
+ inc_finished(mainwin, new_msgs > 0, FALSE);
main_window_unlock(mainwin);
inc_autocheck_timer_set();
gint account_new_msgs = 0;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override( (autocheck == FALSE),
+ _("Claws Mail needs network access in order "
"to get mails.")))
return;
list = account_get_list();
if (!list) {
- inc_finished(mainwin, new_msgs > 0);
+ inc_finished(mainwin, new_msgs > 0, autocheck);
main_window_unlock(mainwin);
inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
new_msgs += inc_start(inc_dialog);
}
- inc_finished(mainwin, new_msgs > 0);
+ inc_finished(mainwin, new_msgs > 0, autocheck);
main_window_unlock(mainwin);
inc_notify_cmd(new_msgs, notify);
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 = 1, 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);
-
- if (pop3_session->ac_prefs->filter_on_recv)
- statusbar_progress_all(cur++,total, prefs_common.statusbar_update_step);
+
+ 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 ||
- !procmsg_msginfo_filter(msginfo, pop3_session->ac_prefs))
- folder_item_move_msg(inbox, msginfo);
- }
filtering_move_and_copy_msgs(msglist);
+ if (unfiltered != NULL)
+ folder_item_move_msgs(inbox, unfiltered);
+
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();
if (alertpanel_full(_("Insecure connection"),
_("This connection is configured to be secured "
"using SSL, but SSL is not available in this "
- "build of Sylpheed-Claws. \n\n"
+ "build of Claws Mail. \n\n"
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
statusbar_print_all("%s", buf);
- log_message("%s\n", buf);
+ log_message(LOG_PROTOCOL, "%s\n", buf);
progress_dialog_set_label(inc_dialog->dialog, buf);
GTK_EVENTS_FLUSH();
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(LOG_PROTOCOL, _("Can't connect to POP3 server: %s:%d\n"),
+ server, port);
}
session->inc_state = INC_CONNECT_ERROR;
statusbar_pop_all();
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)
if (log_msg) {
if (fatal_error)
- log_error("%s\n", log_msg);
+ log_error(LOG_PROTOCOL, "%s\n", log_msg);
else
- log_warning("%s\n", log_msg);
+ log_warning(LOG_PROTOCOL, "%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);
session->inc_state = INC_CANCEL;
- log_message(_("Incorporation cancelled\n"));
+ log_message(LOG_PROTOCOL, _("Incorporation cancelled\n"));
}
gboolean inc_is_active(void)
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;
if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0)
return -1;
- g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%08x",
- get_tmp_dir(), G_DIR_SEPARATOR, (gint)mbox);
+ g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%p",
+ get_tmp_dir(), G_DIR_SEPARATOR, mbox);
- if (copy_mbox(mbox, tmp_mbox) < 0) {
+ if (copy_mbox(lockfd, tmp_mbox) < 0) {
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
return -1;
}
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);
the common preferences */
if (prefs_common.autochk_newmail && autocheck_data
&& prefs_common.work_offline == FALSE) {
- autocheck_timer = gtk_timeout_add
+ autocheck_timer = g_timeout_add
(interval, inc_autocheck_func, autocheck_data);
debug_print("added timer = %d\n", autocheck_timer);
}
{
if (autocheck_timer) {
debug_print("removed timer = %d\n", autocheck_timer);
- gtk_timeout_remove(autocheck_timer);
+ g_source_remove(autocheck_timer);
autocheck_timer = 0;
}
}
return FALSE;
}
-gboolean inc_offline_should_override(const gchar *msg)
+gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
{
static time_t overridden_yes = 0;
static time_t overridden_no = 0;
if (prefs_common.autochk_newmail)
length = prefs_common.autochk_itv; /* minutes */
+ if (force_ask) {
+ overridden_no = (time_t)0;
+ }
+
if (prefs_common.work_offline) {
gchar *tmp = NULL;
if (time(NULL) - overridden_yes < length * 60) /* seconds */
return TRUE;
- else if (time(NULL) - overridden_no < 3) /* seconds */
+ else if (time(NULL) - overridden_no < length * 60) /* seconds */
return FALSE;
- tmp = g_strdup_printf(
+ if (!force_ask)
+ tmp = g_strdup_printf(
_("%s%sYou're working offline. Override for %d minutes?"),
msg?msg:"",
msg?"\n\n":"",
length);
+ else
+ tmp = g_strdup_printf(
+ _("%s%sYou're working offline. Override?"),
+ msg?msg:"",
+ msg?"\n\n":"");
answer = alertpanel(_("Offline warning"),
tmp,
- GTK_STOCK_NO, "+" GTK_STOCK_YES, _("On_ly once"));
+ GTK_STOCK_NO, "+" GTK_STOCK_YES,
+ !force_ask? _("On_ly once"):NULL);
g_free(tmp);
if (answer == G_ALERTALTERNATE) {
overridden_yes = time(NULL);
return TRUE;
} else if (answer == G_ALERTDEFAULT) {
- overridden_no = time(NULL);
+ if (!force_ask)
+ overridden_no = time(NULL);
return FALSE;
} else {
overridden_yes = (time_t)0;
projects / claws.git / blobdiff