/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
static void inc_finished (MainWindow *mainwin,
gboolean new_messages);
-static gint inc_account_mail (PrefsAccount *account,
- MainWindow *mainwin);
+static gint inc_account_mail_real (MainWindow *mainwin,
+ PrefsAccount *account);
static IncProgressDialog *inc_progress_dialog_create
(gboolean autocheck);
static gint inc_recv_message (Session *session,
const gchar *msg,
gpointer data);
+static gint inc_drop_message (Pop3Session *session,
+ const gchar *file);
static void inc_put_error (IncState istate,
const gchar *msg);
return;
}
} else {
- account_new_msgs = inc_account_mail(cur_account, mainwin);
+ account_new_msgs = inc_account_mail_real(mainwin, cur_account);
if (account_new_msgs > 0)
new_msgs += account_new_msgs;
}
void inc_pop_before_smtp(PrefsAccount *acc)
{
/* FIXME: assumes to attach to first main window */
- inc_account_mail(acc, mainwindow_get_mainwindow());
+ inc_account_mail(mainwindow_get_mainwindow(), acc);
}
-static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
+static gint inc_account_mail_real(MainWindow *mainwin, PrefsAccount *account)
{
IncProgressDialog *inc_dialog;
IncSession *session;
return 0;
}
+gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
+{
+ gint new_msgs;
+
+ if (inc_lock_count) return 0;
+
+ if (prefs_common.work_offline)
+ if (alertpanel(_("Offline warning"),
+ _("You're working offline. Override?"),
+ _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ return;
+
+ inc_autocheck_timer_remove();
+ main_window_lock(mainwin);
+
+ new_msgs = inc_account_mail_real(mainwin, account);
+
+ inc_finished(mainwin, new_msgs > 0);
+ main_window_unlock(mainwin);
+ inc_autocheck_timer_set();
+
+ return new_msgs;
+}
+
void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
gboolean notify)
{
}
dialog->dialog = progress;
+ dialog->timer_id = 0;
dialog->queue_list = NULL;
dialog->cur_row = 0;
progress_dialog_set_value(inc_dialog->dialog, 0.0);
progress_dialog_set_label(inc_dialog->dialog, "");
if (inc_dialog->mainwin)
- 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);
+ main_window_progress_off(inc_dialog->mainwin);
}
static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
if (inc_dialog->mainwin)
- 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);
-
+ main_window_progress_off(inc_dialog->mainwin);
progress_dialog_destroy(inc_dialog->dialog);
g_free(inc_dialog);
return NULL;
session = g_new0(IncSession, 1);
+
session->session = pop3_session_new(account);
session->session->data = session;
+ POP3_SESSION(session->session)->drop_message = inc_drop_message;
+ session_set_recv_message_notify(session->session,
+ inc_recv_message, session);
+ session_set_recv_data_progressive_notify(session->session,
+ inc_recv_data_progressive,
+ session);
+ session_set_recv_data_notify(session->session,
+ inc_recv_data_finished, session);
+
+ session->folder_table = g_hash_table_new(NULL, NULL);
+ session->tmp_folder_table = g_hash_table_new(NULL, NULL);
return session;
}
g_return_if_fail(session != NULL);
session_destroy(session->session);
+ g_hash_table_destroy(session->folder_table);
+ g_hash_table_destroy(session->tmp_folder_table);
g_free(session);
}
SET_PIXMAP_AND_TEXT(currentxpm, currentxpmmask,
_("Retrieving"));
- session_set_recv_message_notify(session->session,
- inc_recv_message, session);
- session_set_recv_data_progressive_notify
- (session->session, inc_recv_data_progressive, session);
- session_set_recv_data_notify(session->session,
- inc_recv_data_finished, session);
-
/* begin POP3 session */
inc_state = inc_pop3_session_do(session);
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_MANUAL) && focus_window)) {
+ ((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window))
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
- }
- alertpanel_error
- (_("Authorization for %s on %s failed"),
- pop3_session->user,
- pop3_session->ac_prefs->recv_server);
}
}
folder_item_scan(processing);
msglist = folder_item_get_msg_list(processing);
- folder_item_update_freeze();
-
/* process messages */
for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
msginfo = (MsgInfo *) msglist_element->data;
}
g_slist_free(msglist);
- folder_item_update_thaw();
-
statusbar_pop_all();
new_msgs += pop3_session->cur_total_num;
g_free(buf);
if (session_connect(SESSION(pop3_session), server, port) < 0) {
- log_warning(_("Can't connect to POP3 server: %s:%d\n"),
+ 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) ||
session->inc_state != INC_CANCEL)
gtk_main_iteration();
+ if (inc_dialog->timer_id) {
+ gtk_timeout_remove(inc_dialog->timer_id);
+ inc_dialog->timer_id = 0;
+ }
+
statusbar_pop_all();
if (session->inc_state == INC_SUCCESS) {
}
}
+static gboolean hash_remove_func(gpointer key, gpointer value, gpointer data)
+{
+ return TRUE;
+}
+
+static gint inc_timer_func(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;
+
+ if (g_hash_table_size(inc_session->tmp_folder_table) > 0) {
+ folderview_update_item_foreach(inc_session->tmp_folder_table,
+ FALSE);
+ g_hash_table_foreach_remove(inc_session->tmp_folder_table,
+ hash_remove_func, NULL);
+ }
+
+ return TRUE;
+}
+
static gint inc_recv_data_progressive(Session *session, guint cur_len,
guint total_len, gpointer data)
{
inc_recv_data_progressive(session, 0, len, inc_session);
inc_progress_dialog_set_label(inc_dialog, inc_session);
+ if (POP3_SESSION(session)->state == POP3_LOGOUT &&
+ inc_dialog->timer_id) {
+ inc_timer_func(data);
+ gtk_timeout_remove(inc_dialog->timer_id);
+ inc_dialog->timer_id = 0;
+ }
+
if (pop3_session->cur_total_num == 0) return 0;
msg = g_strdup_printf(_("Retrieving (%d message(s) (%s) received)"),
inc_dialog = (IncProgressDialog *)inc_session->data;
inc_progress_dialog_set_label(inc_dialog, inc_session);
+ if (POP3_SESSION(session)->state == POP3_LOGOUT &&
+ inc_dialog->timer_id) {
+ inc_timer_func(data);
+ gtk_timeout_remove(inc_dialog->timer_id);
+ inc_dialog->timer_id = 0;
+ }
+
return 0;
}
-gint inc_drop_message(const gchar *file, Pop3Session *session)
+static gint inc_drop_message(Pop3Session *session, const gchar *file)
{
FolderItem *inbox;
FolderItem *dropfolder;
+ IncSession *inc_session = (IncSession *)(SESSION(session)->data);
+ IncProgressDialog *inc_dialog;
gint msgnum;
+ gint val;
+
+ g_return_val_if_fail(inc_session != NULL, -1);
if (session->ac_prefs->inbox) {
inbox = folder_find_item_from_identifier
return -1;
}
+ inc_dialog = (IncProgressDialog *)inc_session->data;
+ if (inc_dialog->timer_id == 0)
+ inc_dialog->timer_id = gtk_timeout_add(FOLDER_UPDATE_INTERVAL,
+ inc_timer_func,
+ inc_session);
+
return 0;
}
session->inc_state = INC_CANCEL;
- log_message(_("Incorporation cancelled\n"));
+ log_message("Incorporation cancelled\n");
}
gboolean inc_is_active(void)
{
FolderItem *inbox;
gchar *mbox, *logname;
+ gint result;
logname = g_get_user_name();
inbox = folder_get_default_inbox();
if (is_file_exist(account->local_mbox))
- mbox = g_strconcat(account->local_mbox, NULL);
+ mbox = g_strdup(account->local_mbox);
else
mbox = g_strconcat(account->local_mbox,
G_DIR_SEPARATOR_S, logname, NULL);
-
- return get_spool(inbox, mbox);
+
+ result = get_spool(inbox, mbox);
+ g_free(mbox);
+
+ statusbar_pop_all();
+
+ return result;
}
static gint inc_all_spool(void)
projects / claws.git / blobdiff