2006-02-06 [colin] 2.0.0cvs21
[claws.git] / src / inc.c
index 7dac1653d71cc77aa2784852ca979f4732fbbea6..a550e1f4fc46969dc67b273783641b1750411d67 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * 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
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include <stdio.h>
 #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>
-#include <signal.h>
-#include <errno.h>
 
 #include "main.h"
 #include "inc.h"
@@ -173,10 +166,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
 
        if (inc_lock_count) return;
 
-       if (prefs_common.work_offline)
-               if (alertpanel(_("Offline warning"), 
-                              _("You're working offline. Override?"),
-                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+       if (prefs_common.work_offline && !inc_offline_should_override())
                return;
 
        inc_lock();
@@ -278,11 +268,8 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
 
        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 0;
+       if (prefs_common.work_offline && !inc_offline_should_override())
+               return 0;
 
        inc_autocheck_timer_remove();
        main_window_lock(mainwin);
@@ -304,10 +291,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
        gint new_msgs = 0;
        gint account_new_msgs = 0;
        
-       if (prefs_common.work_offline)
-               if (alertpanel(_("Offline warning"), 
-                              _("You're working offline. Override?"),
-                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+       if (prefs_common.work_offline && !inc_offline_should_override())
                return;
 
        if (inc_lock_count) return;
@@ -400,8 +384,8 @@ static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
        }
 
        dialog->dialog = progress;
-       gettimeofday(&dialog->progress_tv, NULL);
-       gettimeofday(&dialog->folder_tv, NULL);
+       g_get_current_time(&dialog->progress_tv);
+       g_get_current_time(&dialog->folder_tv);
        dialog->queue_list = NULL;
        dialog->cur_row = 0;
 
@@ -648,11 +632,16 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                        g_free(filename);
 
                        if (pop3_session->ac_prefs->filter_on_recv)
-                               statusbar_progress_all(cur++,total, 10);
+                               statusbar_progress_all(cur++,total, prefs_common.statusbar_update_step);
 
                        if (!pop3_session->ac_prefs->filter_on_recv || 
                            !procmsg_msginfo_filter(msginfo))
                                folder_item_move_msg(inbox, msginfo);
+               }
+               filtering_move_and_copy_msgs(msglist);
+               for(msglist_element = msglist; msglist_element != NULL; 
+                   msglist_element = msglist_element->next) {
+                       MsgInfo *msginfo = (MsgInfo *)msglist_element->data;
                        procmsg_msginfo_free(msginfo);
                }
                folder_item_update_thaw();
@@ -767,6 +756,20 @@ static IncState inc_pop3_session_do(IncSession *session)
                SESSION(pop3_session)->nonblocking =
                        pop3_session->ac_prefs->use_nonblocking_ssl;
 #else
+       if (pop3_session->ac_prefs->ssl_pop != SSL_NONE) {
+               if (alertpanel_full(_("Insecure connection"),
+                       _("This connection is configured to be secured "
+                         "using SSL, but SSL is not available in this "
+                         "build of Sylpheed-Claws. \n\n"
+                         "Do you want to continue connecting to this "
+                         "server? The communication would not be "
+                         "secure."),
+                         _("Con_tinue connecting"), 
+                         GTK_STOCK_CANCEL, NULL,
+                         FALSE, NULL, ALERT_WARNING,
+                         G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                       return INC_CONNECT_ERROR;
+       }
        port = pop3_session->ac_prefs->set_popport ?
                pop3_session->ac_prefs->popport : 110;
 #endif
@@ -964,17 +967,17 @@ static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
 static void inc_progress_dialog_update_periodic(IncProgressDialog *inc_dialog,
                                                IncSession *inc_session)
 {
-       struct timeval tv_cur;
-       struct timeval tv_result;
+       GTimeVal tv_cur;
+       GTimeVal tv_result;
        gint msec;
 
-       gettimeofday(&tv_cur, NULL);
+       g_get_current_time(&tv_cur);
 
        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;
+               tv_result.tv_usec += G_USEC_PER_SEC;
        }
 
        msec = tv_result.tv_sec * 1000 + tv_result.tv_usec / 1000;
@@ -1080,7 +1083,7 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file)
        } else
                inbox = folder_get_default_inbox();
        if (!inbox) {
-               unlink(file);
+               g_unlink(file);
                return -1;
        }
 
@@ -1090,7 +1093,7 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file)
        /* add msg file to drop folder */
        if ((msgnum = folder_item_add_msg(
                        dropfolder, file, NULL, TRUE)) < 0) {
-               unlink(file);
+               g_unlink(file);
                return -1;
        }
 
@@ -1246,8 +1249,8 @@ static gint inc_spool_account(PrefsAccount *account)
        gchar *mbox;
        gint result;
 
-       if (account->inbox) {
-               inbox = folder_find_item_from_path(account->inbox);
+       if (account->local_inbox) {
+               inbox = folder_find_item_from_identifier(account->local_inbox);
                if (!inbox)
                        inbox = folder_get_default_inbox();
        } else
@@ -1326,7 +1329,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
 
        msgs = proc_mbox(dest, tmp_mbox, TRUE);
 
-       unlink(tmp_mbox);
+       g_unlink(tmp_mbox);
        if (msgs >= 0) empty_mbox(mbox);
        unlock_mbox(mbox, lockfd, LOCK_FLOCK);
 
@@ -1425,3 +1428,44 @@ static gint inc_autocheck_func(gpointer data)
 
        return FALSE;
 }
+
+gboolean inc_offline_should_override(void)
+{
+       static time_t overridden_yes = 0;
+       static time_t overridden_no  = 0;
+       int length = 10; /* minutes */
+       gint answer = G_ALERTDEFAULT;
+       
+       if (prefs_common.autochk_newmail)
+               length = prefs_common.autochk_itv; /* minutes */
+
+       if (prefs_common.work_offline) {
+               gchar *tmp = NULL;
+               
+               if (time(NULL) - overridden_yes < length * 60) /* seconds */
+                        return TRUE;
+               else if (time(NULL) - overridden_no < length * 60) /* seconds */
+                        return FALSE;
+
+               tmp = g_strdup_printf(
+                               _("You're working offline. Override for %d minutes?"),
+                               length);
+
+               answer = alertpanel(_("Offline warning"), 
+                              tmp,
+                              GTK_STOCK_NO, "+" GTK_STOCK_YES, _("On_ly once"));
+               g_free(tmp);
+               if (answer == G_ALERTALTERNATE) {
+                       overridden_yes = time(NULL);
+                       return TRUE;
+               } else if (answer == G_ALERTDEFAULT) {
+                       overridden_no  = time(NULL);
+                       return FALSE;
+               } else {
+                       overridden_yes = (time_t)0;
+                       overridden_no  = (time_t)0;
+                       return TRUE;
+               }
+       }
+       return TRUE;
+}