#include <gtk/gtkmain.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtksignal.h>
+#include <gtk/gtkprogressbar.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include "account.h"
#include "procmsg.h"
#include "socket.h"
+#include "ssl.h"
#include "pop.h"
#include "recv.h"
#include "mbox.h"
#include "pixmaps/complete.xpm"
#include "pixmaps/error.xpm"
-GdkPixmap *currentxpm;
-GdkBitmap *currentxpmmask;
-GdkPixmap *errorxpm;
-GdkBitmap *errorxpmmask;
-GdkPixmap *okxpm;
-GdkBitmap *okxpmmask;
+static guint inc_lock_count = 0;
+
+static GdkPixmap *currentxpm;
+static GdkBitmap *currentxpmmask;
+static GdkPixmap *errorxpm;
+static GdkBitmap *errorxpmmask;
+static GdkPixmap *okxpm;
+static GdkBitmap *okxpmmask;
#define MSGBUFSIZE 8192
const gchar *mbox);
static void inc_all_spool(void);
-
-static gint inc_autocheck_func (gpointer data);
+static void inc_autocheck_timer_set_interval (guint interval);
+static gint inc_autocheck_func (gpointer data);
/**
* inc_finished:
if (prefs_common.scan_all_after_inc)
folderview_update_all_node();
- /* XXX: major problems right here. if we change marks after
- * incorporation of mail, folderview_select() rewrites it
- * right under our nose. folderview_select() eventually
- * calls summary_show(), which rewrites the cache twice:
- * one for the previously selected FolderItem*, and one
- * for the newly selected FolderItem*
- *
- * since filtering also allows changing mark files,
- * i've solved this by using a global variable (in
- * SummmaryView*). a better solution is to use the folder
- * hash table, and see whether the newly and currently
- * selected FolderItem* where updated by the filtering. */
-
- mainwin->summaryview->filtering_happened = TRUE;
-
- /* XXX: filtering_happened is reset by summary_show() */
if (!new_messages && !prefs_common.scan_all_after_inc) return;
{
gint new_msgs = 0;
+ if (inc_lock_count) return;
+
inc_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
- if (prefs_common.use_extinc && prefs_common.extinc_path) {
- gint pid;
-
+ if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
/* external incorporating program */
- if ((pid = fork()) < 0) {
- perror("fork");
+ if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
main_window_unlock(mainwin);
inc_autocheck_timer_set();
return;
}
- if (pid == 0) {
- execlp(prefs_common.extinc_path,
- g_basename(prefs_common.extinc_path),
- NULL);
-
- /* this will be called when failed */
- perror("exec");
- _exit(1);
- }
-
- /* wait until child process is terminated */
- waitpid(pid, NULL, 0);
-
if (prefs_common.inc_local)
new_msgs = inc_spool();
} else {
IncProgressDialog *inc_dialog;
gint new_msgs = 0;
+ if (inc_lock_count) return;
+
inc_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
GTK_SIGNAL_FUNC(inc_cancel), dialog);
gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
GTK_SIGNAL_FUNC(gtk_true), NULL);
+ /* manage_window_set_transient(GTK_WINDOW(progress->window)); */
progress_dialog_set_value(progress, 0.0);
{
progress_dialog_set_value(inc_dialog->dialog, 0.0);
progress_dialog_set_label(inc_dialog->dialog, "");
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
}
static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
{
g_return_if_fail(inc_dialog != NULL);
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
progress_dialog_destroy(inc_dialog->dialog);
g_free(inc_dialog);
inc_progress_dialog_clear(inc_dialog);
+ gtk_clist_moveto(clist, num, -1, 1.0, 0.0);
+
pop3_state->user = g_strdup(pop3_state->ac_prefs->userid);
if (pop3_state->ac_prefs->passwd)
pop3_state->pass =
num++;
}
- if (error_num) {
+ if (error_num && !prefs_common.noerrorpanel) {
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
NULL, NULL);
return new_msgs;
}
-
static IncState inc_pop3_session_do(IncSession *session)
{
Pop3State *pop3_state = session->pop3_state;
server = pop3_state->ac_prefs->recv_server;
#if USE_SSL
port = pop3_state->ac_prefs->set_popport ?
- pop3_state->ac_prefs->popport : (pop3_state->ac_prefs->ssl_pop ? 995 : 110);
+ pop3_state->ac_prefs->popport :
+ pop3_state->ac_prefs->ssl_pop ? 995 : 110;
#else
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport : 110;
progress_dialog_set_label(inc_dialog->dialog, buf);
g_free(buf);
GTK_EVENTS_FLUSH();
+ statusbar_pop_all();
#if USE_THREADS
if ((sockinfo = sock_connect_with_thread(server, port)) == NULL) {
}
pop3_automaton_terminate(NULL, atm);
automaton_destroy(atm);
+ return INC_CONNECT_ERROR;
+ }
+#if USE_SSL
+ if (pop3_state->ac_prefs->ssl_pop && !ssl_init_socket(sockinfo)) {
+ pop3_automaton_terminate(NULL, atm);
+ automaton_destroy(atm);
return INC_CONNECT_ERROR;
}
+#endif
/* :WK: Hmmm, with the later sock_gdk_input, we have 2 references
* to the sock structure - implement a reference counter?? */
pop3_state->sockinfo = sockinfo;
atm->help_sock = sockinfo;
-#ifdef USE_SSL
- if(pop3_state->ac_prefs->ssl_pop) {
- if(!ssl_init_socket(sockinfo)) {
- pop3_automaton_terminate(NULL, atm);
- automaton_destroy(atm);
-
- return INC_CONNECT_ERROR;
- }
- } else {
- sockinfo->ssl = NULL;
- }
-#endif
-
-
+ log_verbosity_set(TRUE);
recv_set_ui_func(inc_pop3_recv_func, session);
#if USE_THREADS
automaton_input_cb, atm);
#endif
- gtk_main();
+ while (!atm->terminated)
+ gtk_main_iteration();
+ log_verbosity_set(FALSE);
recv_set_ui_func(NULL, NULL);
#if USE_THREADS
-/*
- pthread_join(sockinfo->connect_thr, NULL);
-*/
-#endif
-
-#if USE_SSL
- ssl_done_socket(sockinfo);
+ /* pthread_join(sockinfo->connect_thr, NULL); */
#endif
automaton_destroy(atm);
static gint pop3_automaton_terminate(SockInfo *source, Automaton *atm)
{
+ if (atm->terminated) return 0;
+
if (atm->tag > 0) {
gdk_input_remove(atm->tag);
atm->tag = 0;
gtk_timeout_remove(atm->timeout_tag);
atm->timeout_tag = 0;
}
- if (source) {
+ if (source)
sock_close(source);
- gtk_main_quit();
- }
atm->terminated = TRUE;
manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
}
pop3_automaton_terminate(sockinfo, atm);
+ state->sockinfo = NULL;
return FALSE;
} else if (sockinfo->state == CONN_ESTABLISHED) {
atm->timeout_tag = 0;
progress_dialog_set_percentage
(dialog, (gfloat)cur_total / (gfloat)state->total_bytes);
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)cur_total / (gfloat)state->total_bytes);
GTK_EVENTS_FLUSH();
}
case POP3_GETAUTH_PASS_RECV:
case POP3_GETAUTH_APOP_SEND:
case POP3_GETAUTH_APOP_RECV:
- progress_dialog_set_label(dialog, _("Authorizing..."));
+ progress_dialog_set_label(dialog, _("Authenticating..."));
break;
case POP3_GETRANGE_STAT_SEND:
case POP3_GETRANGE_STAT_RECV:
(dialog,
(gfloat)(state->cur_total_bytes) /
(gfloat)(state->total_bytes));
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)(state->cur_total_bytes) /
+ (gfloat)(state->total_bytes));
break;
case POP3_DELETE_SEND:
case POP3_DELETE_RECV:
FolderItem *dropfolder;
gint val;
gint msgnum;
-
+ FolderItem *filtering_folder = folder_get_default_processing();
+
if (state->ac_prefs->inbox) {
inbox = folder_find_item_from_path(state->ac_prefs->inbox);
if (!inbox)
return -1;
}
- if (prefs_filtering == NULL) {
+ if (global_processing == NULL) {
/* old filtering */
if (state->ac_prefs->filter_on_recv) {
dropfolder =
dropfolder = inbox;
} else {
/* new filtering */
- dropfolder = inbox;
+ dropfolder = filtering_folder;
}
val = GPOINTER_TO_INT(g_hash_table_lookup
g_hash_table_insert(state->folder_table, dropfolder,
GINT_TO_POINTER(1));
}
+
+ if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
+ unlink(file);
+ return -1;
+ }
- if (prefs_filtering == NULL || !state->ac_prefs->filter_on_recv) {
- if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
- unlink(file);
- return -1;
- }
+ if (global_processing != NULL) {
+ /* new filtering */
+ if (state->ac_prefs->filter_on_recv)
+ filter_message(global_processing, dropfolder, msgnum,
+ state->folder_table);
}
- else {
- filter_incoming_message(dropfolder, file, state->folder_table);
- }
return 0;
}
IncSession *session = dialog->queue_list->data;
SockInfo *sockinfo = session->pop3_state->sockinfo;
+ if (!sockinfo || session->atm->terminated == TRUE) return;
+
#if USE_THREADS
if (sockinfo->state == CONN_READY ||
sockinfo->state == CONN_LOOKUPSUCCESS) {
session->pop3_state->inc_state = INC_CANCEL;
pop3_automaton_terminate(sockinfo, session->atm);
+ session->pop3_state->sockinfo = NULL;
}
static gint inc_spool(void)
return msgs;
}
+void inc_lock(void)
+{
+ inc_lock_count++;
+}
+
+void inc_unlock(void)
+{
+ if (inc_lock_count > 0)
+ inc_lock_count--;
+}
+
static guint autocheck_timer = 0;
static gpointer autocheck_data = NULL;
inc_autocheck_timer_set();
}
-void inc_autocheck_timer_set(void)
+static void inc_autocheck_timer_set_interval(guint interval)
{
inc_autocheck_timer_remove();
if (prefs_common.autochk_newmail && autocheck_data) {
autocheck_timer = gtk_timeout_add
- (prefs_common.autochk_itv * 60000,
- inc_autocheck_func,
- autocheck_data);
+ (interval, inc_autocheck_func, autocheck_data);
+ debug_print("added timer = %d\n", autocheck_timer);
}
}
+void inc_autocheck_timer_set(void)
+{
+ inc_autocheck_timer_set_interval(prefs_common.autochk_itv * 60000);
+}
+
void inc_autocheck_timer_remove(void)
{
if (autocheck_timer) {
+ debug_print("removed timer = %d\n", autocheck_timer);
gtk_timeout_remove(autocheck_timer);
autocheck_timer = 0;
}
{
MainWindow *mainwin = (MainWindow *)data;
+ if (inc_lock_count) {
+ debug_print("autocheck is locked.\n");
+ inc_autocheck_timer_set_interval(1000);
+ return FALSE;
+ }
+
inc_all_account_mail(mainwin);
return FALSE;
projects / claws.git / blobdiff