/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2013 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include "filtering.h"
#include "log.h"
#include "hooks.h"
+#include "logwindow.h"
+
+extern SessionStats session_stats;
static GList *inc_dialog_list = NULL;
-static guint inc_lock_count = 0;
+guint inc_lock_count = 0;
static GdkPixbuf *currentpix;
static GdkPixbuf *errorpix;
static GdkPixbuf *okpix;
-#define MSGBUFSIZE 8192
+#define MESSAGEBUFSIZE 8192
+static void inc_update_stats(gint new_msgs);
static void inc_finished (MainWindow *mainwin,
- gboolean new_messages);
+ gboolean new_messages,
+ gboolean autocheck);
static gint inc_account_mail_real (MainWindow *mainwin,
PrefsAccount *account);
static void inc_put_error (IncState istate,
Pop3Session *session);
+static void inc_showlog_cb (GtkWidget *widget,
+ gpointer data);
static void inc_cancel_cb (GtkWidget *widget,
gpointer data);
static gint inc_dialog_delete_cb (GtkWidget *widget,
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);
static void inc_notify_cmd (gint new_msgs,
gboolean notify);
-
+
+static void inc_update_stats(gint new_msgs)
+{
+ /* update session statistics */
+ session_stats.received += new_msgs;
+}
+
/**
* inc_finished:
* @mainwin: Main window.
* 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 && new_messages && 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 && 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;
if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
main_window_unlock(mainwin);
inc_autocheck_timer_set();
+ inc_unlock();
return;
}
} else {
new_msgs += account_new_msgs;
}
- inc_finished(mainwin, new_msgs > 0);
+ inc_update_stats(new_msgs);
+ 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 (account->receive_in_progress) 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_update_stats(new_msgs);
+ 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_update_stats(new_msgs);
+ inc_finished(mainwin, new_msgs > 0, autocheck);
main_window_unlock(mainwin);
inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
return;
}
+ if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
+ /* external incorporating program */
+ if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
+ log_error(LOG_PROTOCOL, _("%s failed\n"), prefs_common.extinc_cmd);
+
+ main_window_unlock(mainwin);
+ inc_autocheck_timer_set();
+ return;
+ }
+ }
+
/* check local folders */
account_new_msgs = inc_all_spool();
if (account_new_msgs > 0)
PrefsAccount *account = list->data;
if (account->recv_at_getall) {
- session = inc_session_new(account);
- if (session)
- queue_list = g_list_append(queue_list, session);
+ if (!(account->receive_in_progress)) {
+ session = inc_session_new(account);
+ if (session)
+ queue_list = g_list_append(queue_list, session);
+ }
}
}
new_msgs += inc_start(inc_dialog);
}
- inc_finished(mainwin, new_msgs > 0);
+ inc_update_stats(new_msgs);
+ 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)
+{
+ cm_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);
progress = progress_dialog_create();
gtk_window_set_title(GTK_WINDOW(progress->window),
_("Retrieving new messages"));
+ g_signal_connect(G_OBJECT(progress->showlog_btn), "clicked",
+ G_CALLBACK(inc_showlog_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)); */
+ 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)) {
static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
{
- g_return_if_fail(inc_dialog != NULL);
+ cm_return_if_fail(inc_dialog != NULL);
inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
{
IncSession *session;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
if (account->protocol != A_POP3)
return NULL;
static void inc_session_destroy(IncSession *session)
{
- g_return_if_fail(session != NULL);
+ cm_return_if_fail(session != NULL);
session_destroy(session->session);
g_free(session);
}
+static gint pop3_get_port(Pop3Session *pop3_session)
+{
+#ifdef USE_GNUTLS
+ return pop3_session->ac_prefs->set_popport ?
+ pop3_session->ac_prefs->popport :
+ pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
+#else
+ return pop3_session->ac_prefs->set_popport ?
+ pop3_session->ac_prefs->popport : 110;
+#endif
+}
+
static gint inc_start(IncProgressDialog *inc_dialog)
{
IncSession *session;
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)
+
+ if (password_get(pop3_session->user,
+ pop3_session->ac_prefs->recv_server,
+ "pop3", pop3_get_port(pop3_session),
+ &(pop3_session->pass))) {
+ /* NOP */;
+ } else if (pop3_session->ac_prefs->passwd)
pop3_session->pass =
g_strdup(pop3_session->ac_prefs->passwd);
- else if (pop3_session->ac_prefs->tmp_pass)
- pop3_session->pass =
- g_strdup(pop3_session->ac_prefs->tmp_pass);
else {
gchar *pass;
(inc_dialog->dialog->window,
NULL, NULL);
- pass = input_dialog_query_password
+ pass = input_dialog_query_password_keep
(pop3_session->ac_prefs->recv_server,
- pop3_session->user);
+ pop3_session->user,
+ &(pop3_session->ac_prefs->session_passwd));
if (inc_dialog->show_dialog)
manage_window_focus_out
NULL, NULL);
if (pass) {
- pop3_session->ac_prefs->tmp_pass =
- g_strdup(pass);
pop3_session->pass = pass;
}
}
"Done (%d messages (%s) received)",
pop3_session->cur_total_num),
pop3_session->cur_total_num,
- to_human_readable(pop3_session->cur_total_recv_bytes));
+ to_human_readable((goffset)pop3_session->cur_total_recv_bytes));
else
msg = g_strdup_printf(_("Done (no new messages)"));
SET_PIXMAP_AND_TEXT(okpix, msg);
break;
case INC_AUTH_FAILED:
SET_PIXMAP_AND_TEXT(errorpix, _("Auth failed"));
+ if (pop3_session->ac_prefs->session_passwd) {
+ g_free(pop3_session->ac_prefs->session_passwd);
+ pop3_session->ac_prefs->session_passwd = NULL;
+ }
break;
case INC_LOCKED:
SET_PIXMAP_AND_TEXT(errorpix, _("Locked"));
inbox = folder_get_default_inbox();
/* get list of messages in processing */
- processing = folder_get_default_processing();
+ processing = folder_get_default_processing(pop3_session->ac_prefs->account_id);
folder_item_scan(processing);
msglist = folder_item_get_msg_list(processing);
&filtered, &unfiltered,
pop3_session->ac_prefs->filter_on_recv);
- if (filtered != NULL)
- filtering_move_and_copy_msgs(filtered);
- if (unfiltered != NULL)
+ 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;
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free((MsgInfo**)&(msglist_element->data));
}
folder_item_update_thaw();
new_msgs += pop3_session->cur_total_num;
- if (pop3_session->error_val == PS_AUTHFAIL &&
- pop3_session->ac_prefs->tmp_pass) {
- g_free(pop3_session->ac_prefs->tmp_pass);
- pop3_session->ac_prefs->tmp_pass = NULL;
- }
-
pop3_write_uidl_list(pop3_session);
if (inc_state != INC_SUCCESS && inc_state != INC_CANCEL) {
Pop3Session *pop3_session = POP3_SESSION(session->session);
IncProgressDialog *inc_dialog = (IncProgressDialog *)session->data;
gchar *server;
+ gchar *account_name;
gushort port;
gchar *buf;
g_free(buf);
server = pop3_session->ac_prefs->recv_server;
-#if USE_OPENSSL
- port = pop3_session->ac_prefs->set_popport ?
- pop3_session->ac_prefs->popport :
- pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
+ account_name = pop3_session->ac_prefs->account_name;
+ port = pop3_get_port(pop3_session);
+
+#ifdef USE_GNUTLS
SESSION(pop3_session)->ssl_type = pop3_session->ac_prefs->ssl_pop;
if (pop3_session->ac_prefs->ssl_pop != SSL_NONE)
SESSION(pop3_session)->nonblocking =
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."),
G_ALERTDEFAULT) != G_ALERTALTERNATE)
return INC_CANCEL;
}
- port = pop3_session->ac_prefs->set_popport ?
- pop3_session->ac_prefs->popport : 110;
#endif
- buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
- statusbar_print_all("%s", buf);
- log_message("%s\n", buf);
+ buf = g_strdup_printf(_("Account '%s': Connecting to POP3 server: %s:%d..."),
+ account_name, server, port);
+ statuswindow_print_all("%s", buf);
+ log_message(LOG_PROTOCOL, "%s\n", buf);
progress_dialog_set_label(inc_dialog->dialog, buf);
GTK_EVENTS_FLUSH();
server, port);
manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
} else {
- log_error(_("Can't connect to POP3 server: %s:%d\n"),
+ log_error(LOG_PROTOCOL, _("Can't connect to POP3 server: %s:%d\n"),
server, port);
}
session->inc_state = INC_CONNECT_ERROR;
- statusbar_pop_all();
+ statuswindow_pop_all();
return INC_CONNECT_ERROR;
}
- while (session_is_connected(SESSION(pop3_session)) &&
+ while (session_is_running(SESSION(pop3_session)) &&
session->inc_state != INC_CANCEL)
gtk_main_iteration();
ProgressDialog *dialog = inc_dialog->dialog;
Pop3Session *session;
- g_return_if_fail(inc_session != NULL);
+ cm_return_if_fail(inc_session != NULL);
session = POP3_SESSION(inc_session->session);
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) ..."),
+ statuswindow_pop_all();
+ statusbar_print_all(_("Retrieving messages from %s (%s)..."),
SESSION(session)->server,
session->ac_prefs->account_name);
break;
static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
IncSession *inc_session)
{
- gchar buf[MSGBUFSIZE];
+ gchar buf[MESSAGEBUFSIZE];
Pop3Session *pop3_session = POP3_SESSION(inc_session->session);
gchar *total_size_str;
gint cur_total;
if (pop3_session->state == POP3_RETR ||
pop3_session->state == POP3_RETR_RECV ||
pop3_session->state == POP3_DELETE) {
- Xstrdup_a(total_size_str, to_human_readable(total), return);
+ Xstrdup_a(total_size_str, to_human_readable((goffset)total), return);
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_str);
+ to_human_readable((goffset)cur_total), total_size_str);
progress_dialog_set_label(inc_dialog->dialog, buf);
}
progress_dialog_set_fraction
(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_set_text
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), buf);
- gtk_progress_bar_set_fraction
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (total == 0) ? 0 : (gfloat)cur_total / (gfloat)total);
+ statusbar_progress_all(pop3_session->cur_msg, pop3_session->count, 1);
if (pop3_session->cur_total_num > 0) {
g_snprintf(buf, sizeof(buf),
pop3_session->cur_total_num),
pop3_session->cur_total_num,
to_human_readable
- (pop3_session->cur_total_recv_bytes));
+ ((goffset)pop3_session->cur_total_recv_bytes));
progress_dialog_list_set_status(inc_dialog->dialog,
inc_dialog->cur_row,
buf);
IncProgressDialog *inc_dialog;
gint cur_total;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
if (pop3_session->state != POP3_RETR &&
pop3_session->state != POP3_RETR_RECV &&
IncSession *inc_session = (IncSession *)data;
IncProgressDialog *inc_dialog;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
inc_dialog = (IncProgressDialog *)inc_session->data;
IncSession *inc_session = (IncSession *)data;
IncProgressDialog *inc_dialog;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
inc_dialog = (IncProgressDialog *)inc_session->data;
IncSession *inc_session = (IncSession *)(SESSION(session)->data);
gint msgnum;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
if (session->ac_prefs->inbox) {
inbox = folder_find_item_from_identifier
} else
inbox = folder_get_default_inbox();
if (!inbox) {
- g_unlink(file);
+ claws_unlink(file);
return -1;
}
/* CLAWS: claws uses a global .processing folder for the filtering. */
- dropfolder = folder_get_default_processing();
+ dropfolder = folder_get_default_processing(session->ac_prefs->account_id);
/* add msg file to drop folder */
if ((msgnum = folder_item_add_msg(
dropfolder, file, NULL, TRUE)) < 0) {
- g_unlink(file);
+ claws_unlink(file);
return -1;
}
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."),
SESSION(session)->server,
SESSION(session)->port);
- fatal_error = TRUE;
break;
case INC_ERROR:
log_msg = _("Error occurred while processing mail.");
break;
case INC_SOCKET_ERROR:
log_msg = _("Socket error.");
- fatal_error = TRUE;
if (prefs_common.no_recv_err_panel)
break;
err_msg = g_strdup_printf(_("Socket error on connection to %s:%d."),
break;
case INC_AUTH_FAILED:
log_msg = _("Authentication failed.");
+ fatal_error = TRUE;
if (prefs_common.no_recv_err_panel)
break;
if (session->error_msg)
err_msg = g_strdup(log_msg);
break;
case INC_TIMEOUT:
- log_msg = _("Session timed out.");
- fatal_error = TRUE;
+ log_msg = _("Session timed out. You may be able to "
+ "recover by increasing the timeout value in "
+ "Preferences/Other/Miscellaneous.");
if (prefs_common.no_recv_err_panel)
break;
err_msg = g_strdup_printf(_("Connection to %s:%d timed out."),
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);
+ alertpanel_error_log("%s", err_msg);
g_free(err_msg);
}
}
{
IncSession *session;
- g_return_if_fail(dialog != NULL);
+ cm_return_if_fail(dialog != NULL);
if (dialog->queue_list == NULL) {
inc_progress_dialog_destroy(dialog);
session->inc_state = INC_CANCEL;
- log_message(_("Incorporation cancelled\n"));
+ log_message(LOG_PROTOCOL, _("Incorporation cancelled\n"));
}
gboolean inc_is_active(void)
inc_cancel((IncProgressDialog *)cur->data);
}
+static void inc_showlog_cb(GtkWidget *widget, gpointer data)
+{
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+
+ log_window_show(mainwin->logwin);
+}
+
static void inc_cancel_cb(GtkWidget *widget, gpointer data)
{
inc_cancel((IncProgressDialog *)data);
} else
inbox = folder_get_default_inbox();
- if (is_file_exist(account->local_mbox))
- mbox = g_strdup(account->local_mbox);
- else if (is_dir_exist(account->local_mbox))
- mbox = g_strconcat(account->local_mbox, G_DIR_SEPARATOR_S,
- g_get_user_name(), NULL);
- else {
- debug_print("%s: local mailbox not found.\n",
- account->local_mbox);
+ if (account->local_mbox) {
+ if (is_file_exist(account->local_mbox))
+ mbox = g_strdup(account->local_mbox);
+ else if (is_dir_exist(account->local_mbox))
+ mbox = g_strconcat(account->local_mbox, G_DIR_SEPARATOR_S,
+ g_get_user_name(), NULL);
+ else {
+ debug_print("%s: local mailbox not found.\n",
+ account->local_mbox);
+ return -1;
+ }
+ } else {
+ debug_print("local mailbox not set in account info.\n");
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;
gchar tmp_mbox[MAXPATHLEN + 1];
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(mbox != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(mbox != NULL, -1);
+ cm_return_val_if_fail(account != NULL, -1);
if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
debug_print("%s: no messages in local mailbox.\n", mbox);
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, account->filter_on_recv, account);
- g_unlink(tmp_mbox);
+ claws_unlink(tmp_mbox);
if (msgs >= 0) empty_mbox(mbox);
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
return msgs;
}
-void inc_lock(void)
+void inc_lock_real(void)
{
inc_lock_count++;
}
-void inc_unlock(void)
+void inc_unlock_real(void)
{
if (inc_lock_count > 0)
inc_lock_count--;
static void inc_notify_cmd(gint new_msgs, gboolean notify)
{
-
gchar *buf, *numpos, *ret_str;
gssize by_read = 0, by_written = 0;
if (!(new_msgs && notify && prefs_common.newmail_notify_cmd &&
*prefs_common.newmail_notify_cmd))
return;
+
buf = g_strdup(prefs_common.newmail_notify_cmd);
if ((numpos = strstr(buf, "%d")) != NULL) {
gchar *buf2;
g_free(buf);
}
-
+
void inc_autocheck_timer_init(MainWindow *mainwin)
{
autocheck_data = mainwin;
the common preferences */
if (prefs_common.autochk_newmail && autocheck_data
&& prefs_common.work_offline == FALSE) {
- autocheck_timer = gtk_timeout_add
- (interval, inc_autocheck_func, autocheck_data);
+ if (interval % 1000 == 0)
+ autocheck_timer =
+ g_timeout_add_seconds(interval/1000, inc_autocheck_func, autocheck_data);
+ else
+ 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;
int length = 10; /* minutes */
gint answer = G_ALERTDEFAULT;
-
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ /* If no network connection is available, override is not possible */
+ if(!networkmanager_is_online(NULL))
+ return FALSE;
+#endif
+
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