2007-03-31 [colin] 2.8.1cvs71

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index e64e233454aa38d20eb76a3b4d101751e20dd41e..02414b1c81710c402536e5acdd6eb54d40565282 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -72,7 +72,8 @@ static GdkPixbuf *okpix;
 #define MSGBUFSIZE     8192
 
 static void inc_finished               (MainWindow             *mainwin,
-                                        gboolean                new_messages);
+                                        gboolean                new_messages,
+                                        gboolean                autocheck);
 static gint inc_account_mail_real      (MainWindow             *mainwin,
                                         PrefsAccount           *account);
 
@@ -143,19 +144,21 @@ static void inc_notify_cmd                (gint new_msgs,
  * 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 && 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->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);
        }
@@ -191,7 +194,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
                        new_msgs += account_new_msgs;
        }
 
-       inc_finished(mainwin, new_msgs > 0);
+       inc_finished(mainwin, new_msgs > 0, FALSE);
        main_window_unlock(mainwin);
        inc_notify_cmd(new_msgs, notify);
        inc_autocheck_timer_set();
@@ -284,7 +287,7 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
 
        new_msgs = inc_account_mail_real(mainwin, account);
 
-       inc_finished(mainwin, new_msgs > 0);
+       inc_finished(mainwin, new_msgs > 0, FALSE);
        main_window_unlock(mainwin);
        inc_autocheck_timer_set();
 
@@ -312,7 +315,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
 
        list = account_get_list();
        if (!list) {
-               inc_finished(mainwin, new_msgs > 0);
+               inc_finished(mainwin, new_msgs > 0, autocheck);
                main_window_unlock(mainwin);
                inc_notify_cmd(new_msgs, notify);
                inc_autocheck_timer_set();
@@ -356,7 +359,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
                new_msgs += inc_start(inc_dialog);
        }
 
-       inc_finished(mainwin, new_msgs > 0);
+       inc_finished(mainwin, new_msgs > 0, autocheck);
        main_window_unlock(mainwin);
        inc_notify_cmd(new_msgs, notify);
        inc_autocheck_timer_set();
@@ -785,7 +788,7 @@ static IncState inc_pop3_session_do(IncSession *session)
 
        buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
        statusbar_print_all("%s", buf);
-       log_message("%s\n", buf);
+       log_message(LOG_PROTOCOL, "%s\n", buf);
 
        progress_dialog_set_label(inc_dialog->dialog, buf);
        GTK_EVENTS_FLUSH();
@@ -804,7 +807,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                                         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;
@@ -1192,9 +1195,9 @@ static void inc_put_error(IncState istate, Pop3Session *session)
 
        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();
@@ -1220,7 +1223,7 @@ static void inc_cancel(IncProgressDialog *dialog)
 
        session->inc_state = INC_CANCEL;
 
-       log_message(_("Incorporation cancelled\n"));
+       log_message(LOG_PROTOCOL, _("Incorporation cancelled\n"));
 }
 
 gboolean inc_is_active(void)
@@ -1328,7 +1331,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account
        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;
        }
@@ -1453,7 +1456,7 @@ gboolean inc_offline_should_override(const gchar *msg)
                
                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(