From a148c8534ad9eeec008134db45e4eb1bfbfdb587 Mon Sep 17 00:00:00 2001 From: hiro Date: Tue, 19 Jun 2012 08:54:30 +0000 Subject: fixed 'Stop' button didn't become inactive after POP3 session finished. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3110 ee746299-78ed-0310-b773-934348b2243d --- src/inc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/inc.c b/src/inc.c index 1ad70cfc..e8c1b12a 100644 --- a/src/inc.c +++ b/src/inc.c @@ -293,9 +293,9 @@ void inc_mail(MainWindow *mainwin) if (prefs_common.use_extinc && prefs_common.extinc_cmd) { /* external incorporating program */ if (execute_command_line(prefs_common.extinc_cmd, FALSE) != 0) { + inc_is_running = FALSE; main_window_unlock(mainwin); inc_autocheck_timer_set(); - inc_is_running = FALSE; return; } @@ -318,10 +318,11 @@ void inc_mail(MainWindow *mainwin) inc_finished(mainwin, list); slist_free_strings(list); g_slist_free(list); - main_window_unlock(mainwin); - inc_autocheck_timer_set(); inc_is_running = FALSE; + + main_window_unlock(mainwin); + inc_autocheck_timer_set(); } static gint inc_remote_account_mail(MainWindow *mainwin, PrefsAccount *account) @@ -503,11 +504,12 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account) inc_finished(mainwin, list); slist_free_strings(list); g_slist_free(list); - main_window_unlock(mainwin); - inc_autocheck_timer_set(); inc_is_running = FALSE; + main_window_unlock(mainwin); + inc_autocheck_timer_set(); + return new_msgs; } @@ -576,10 +578,11 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck) inc_finished(mainwin, count_list); slist_free_strings(count_list); g_slist_free(count_list); - main_window_unlock(mainwin); - inc_autocheck_timer_set(); inc_is_running = FALSE; + + main_window_unlock(mainwin); + inc_autocheck_timer_set(); } gint inc_pop_before_smtp(PrefsAccount *account) @@ -617,11 +620,11 @@ gint inc_pop_before_smtp(PrefsAccount *account) inc_start(inc_dialog, NULL); + inc_is_running = FALSE; + main_window_unlock(mainwin); inc_autocheck_timer_set(); - inc_is_running = FALSE; - return 0; } -- cgit v1.2.3