/*
* 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
#include <unistd.h>
#include <string.h>
#include <time.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
static gint inc_start (IncProgressDialog *inc_dialog);
static IncState inc_pop3_session_do (IncSession *session);
+static void inc_progress_dialog_update (IncProgressDialog *inc_dialog,
+ IncSession *inc_session);
+
static void inc_progress_dialog_set_label
(IncProgressDialog *inc_dialog,
IncSession *inc_session);
+static void inc_progress_dialog_set_progress
+ (IncProgressDialog *inc_dialog,
+ IncSession *inc_session);
+
+static void inc_update_folderview (IncProgressDialog *inc_dialog,
+ IncSession *inc_session);
+
+static void inc_progress_dialog_update_periodic
+ (IncProgressDialog *inc_dialog,
+ IncSession *inc_session);
+static void inc_update_folderview_periodic
+ (IncProgressDialog *inc_dialog,
+ IncSession *inc_session);
static gint inc_recv_data_progressive (Session *session,
guint cur_len,
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);
}
dialog->dialog = progress;
+ gettimeofday(&dialog->progress_tv, NULL);
+ gettimeofday(&dialog->folder_tv, NULL);
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_list_remove(inc_dialog->queue_list, session);
}
- if (prefs_common.close_recv_dialog)
+ if (prefs_common.close_recv_dialog || !inc_dialog->show_dialog)
inc_progress_dialog_destroy(inc_dialog);
else {
gtk_window_set_title(GTK_WINDOW(inc_dialog->dialog->window),
return session->inc_state;
}
+static void inc_progress_dialog_update(IncProgressDialog *inc_dialog,
+ IncSession *inc_session)
+{
+ inc_progress_dialog_set_label(inc_dialog, inc_session);
+ inc_progress_dialog_set_progress(inc_dialog, inc_session);
+}
+
static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
IncSession *inc_session)
{
- gchar buf[MSGBUFSIZE];
ProgressDialog *dialog = inc_dialog->dialog;
Pop3Session *session;
case POP3_GETAUTH_PASS:
case POP3_GETAUTH_APOP:
progress_dialog_set_label(dialog, _("Authenticating..."));
- statusbar_print_all(_("Retrieving messages from %s..."),
- SESSION(session)->server);
+ statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
+ SESSION(session)->server,
+ session->ac_prefs->account_name);
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,
- inc_session);
+ case POP3_RETR_RECV:
break;
case POP3_DELETE:
+#if 0
if (session->msg[session->cur_msg].recv_time <
session->current_time) {
+ gchar buf[MSGBUFSIZE];
g_snprintf(buf, sizeof(buf), _("Deleting message %d"),
session->cur_msg);
progress_dialog_set_label(dialog, buf);
}
+#endif
break;
case POP3_LOGOUT:
progress_dialog_set_label(dialog, _("Quitting"));
}
}
+static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
+ IncSession *inc_session)
+{
+ gchar buf[MSGBUFSIZE];
+ Pop3Session *pop3_session = POP3_SESSION(inc_session->session);
+ gchar *total_size_str;
+ gint cur_total;
+ gint total;
+
+ if (!pop3_session->new_msg_exist) return;
+
+ cur_total = inc_session->cur_total_bytes;
+ total = pop3_session->total_bytes;
+ 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);
+ 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);
+ progress_dialog_set_label(inc_dialog->dialog, buf);
+ }
+
+ progress_dialog_set_percentage
+ (inc_dialog->dialog,(gfloat)cur_total / (gfloat)total);
+
+ gtk_progress_set_show_text
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), TRUE);
+ g_snprintf(buf, sizeof(buf), "%d / %d",
+ pop3_session->cur_msg, pop3_session->count);
+ gtk_progress_set_format_string
+ (GTK_PROGRESS(inc_dialog->mainwin->progressbar), buf);
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)cur_total / (gfloat)total);
+
+ if (pop3_session->cur_total_num > 0) {
+ g_snprintf(buf, sizeof(buf),
+ _("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, buf);
+ }
+}
+
+static gboolean hash_remove_func(gpointer key, gpointer value, gpointer data)
+{
+ return TRUE;
+}
+
+static void inc_update_folderview(IncProgressDialog *inc_dialog,
+ IncSession *inc_session)
+{
+ 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);
+ }
+}
+
+static void inc_progress_dialog_update_periodic(IncProgressDialog *inc_dialog,
+ IncSession *inc_session)
+{
+ struct timeval tv_cur;
+ struct timeval tv_result;
+ gint msec;
+
+ gettimeofday(&tv_cur, NULL);
+
+ tv_result.tv_sec = tv_cur.tv_sec - inc_dialog->progress_tv.tv_sec;
+ tv_result.tv_usec = tv_cur.tv_usec - inc_dialog->progress_tv.tv_usec;
+ if (tv_result.tv_usec < 0) {
+ tv_result.tv_sec--;
+ tv_result.tv_usec += 1000000;
+ }
+
+ msec = tv_result.tv_sec * 1000 + tv_result.tv_usec / 1000;
+ if (msec > PROGRESS_UPDATE_INTERVAL) {
+ inc_progress_dialog_update(inc_dialog, inc_session);
+ inc_dialog->progress_tv.tv_sec = tv_cur.tv_sec;
+ inc_dialog->progress_tv.tv_usec = tv_cur.tv_usec;
+ }
+}
+
+static void inc_update_folderview_periodic(IncProgressDialog *inc_dialog,
+ IncSession *inc_session)
+{
+ struct timeval tv_cur;
+ struct timeval tv_result;
+ gint msec;
+
+ gettimeofday(&tv_cur, NULL);
+
+ tv_result.tv_sec = tv_cur.tv_sec - inc_dialog->folder_tv.tv_sec;
+ tv_result.tv_usec = tv_cur.tv_usec - inc_dialog->folder_tv.tv_usec;
+ if (tv_result.tv_usec < 0) {
+ tv_result.tv_sec--;
+ tv_result.tv_usec += 1000000;
+ }
+
+ msec = tv_result.tv_sec * 1000 + tv_result.tv_usec / 1000;
+ if (msec > FOLDER_UPDATE_INTERVAL) {
+ inc_update_folderview(inc_dialog, inc_session);
+ inc_dialog->folder_tv.tv_sec = tv_cur.tv_sec;
+ inc_dialog->folder_tv.tv_usec = tv_cur.tv_usec;
+ }
+}
+
static gint inc_recv_data_progressive(Session *session, guint cur_len,
guint total_len, gpointer data)
{
- gchar buf[MSGBUFSIZE];
IncSession *inc_session = (IncSession *)data;
Pop3Session *pop3_session = POP3_SESSION(session);
IncProgressDialog *inc_dialog;
- ProgressDialog *dialog;
gint cur_total;
- gchar *total_size;
g_return_val_if_fail(inc_session != NULL, -1);
if (!pop3_session->new_msg_exist) return 0;
- inc_dialog = (IncProgressDialog *)inc_session->data;
- dialog = inc_dialog->dialog;
-
cur_total = pop3_session->cur_total_bytes + cur_len;
if (cur_total > pop3_session->total_bytes)
cur_total = pop3_session->total_bytes;
+ inc_session->cur_total_bytes = cur_total;
- Xstrdup_a(total_size, to_human_readable(pop3_session->total_bytes),
- return FALSE);
- 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);
- progress_dialog_set_label(dialog, buf);
- progress_dialog_set_percentage
- (dialog, (gfloat)cur_total / (gfloat)pop3_session->total_bytes);
- if (inc_dialog->mainwin)
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (gfloat)cur_total / (gfloat)pop3_session->total_bytes);
+ inc_dialog = (IncProgressDialog *)inc_session->data;
+ inc_progress_dialog_update_periodic(inc_dialog, inc_session);
+ inc_update_folderview_periodic(inc_dialog, inc_session);
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_dialog = (IncProgressDialog *)inc_session->data;
- 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;
+ inc_recv_data_progressive(session, 0, 0, inc_session);
- 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);
+ if (POP3_SESSION(session)->state == POP3_LOGOUT) {
+ inc_progress_dialog_update(inc_dialog, inc_session);
+ inc_update_folderview(inc_dialog, inc_session);
+ }
return 0;
}
g_return_val_if_fail(inc_session != NULL, -1);
inc_dialog = (IncProgressDialog *)inc_session->data;
- inc_progress_dialog_set_label(inc_dialog, inc_session);
+
+ switch (POP3_SESSION(session)->state) {
+ case POP3_GETAUTH_USER:
+ case POP3_GETAUTH_PASS:
+ case POP3_GETAUTH_APOP:
+ case POP3_GETRANGE_STAT:
+ case POP3_GETRANGE_LAST:
+ case POP3_GETRANGE_UIDL:
+ case POP3_GETSIZE_LIST:
+ inc_progress_dialog_update(inc_dialog, inc_session);
+ break;
+ case POP3_RETR:
+ inc_recv_data_progressive(session, 0, 0, inc_session);
+ break;
+ case POP3_LOGOUT:
+ inc_progress_dialog_update(inc_dialog, inc_session);
+ inc_update_folderview(inc_dialog, inc_session);
+ break;
+ default:
+ break;
+ }
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);
gint msgnum;
+ gint val;
+
+ g_return_val_if_fail(inc_session != NULL, -1);
if (session->ac_prefs->inbox) {
inbox = folder_find_item_from_identifier
debug_print("Getting new messages from %s into %s...\n",
mbox, dest->path);
- msgs = proc_mbox(dest, tmp_mbox);
+ msgs = proc_mbox(dest, tmp_mbox, TRUE);
unlink(tmp_mbox);
if (msgs >= 0) empty_mbox(mbox);
projects / claws.git / blobdiff