projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed SessionMsgType enum and its use, since it is useless.
[claws.git] / src / pop.c
diff --git a/src/pop.c b/src/pop.c
index 37ece014e16c0fc42773ea77ab3827cc320a18ef..ee2db434e10ab270cedede0015e3e6c24d11a8e8 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -45,7 +46,7 @@ static gint pop3_greeting_recv                (Pop3Session *session,
 static gint pop3_getauth_user_send     (Pop3Session *session);
 static gint pop3_getauth_pass_send     (Pop3Session *session);
 static gint pop3_getauth_apop_send     (Pop3Session *session);
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
 static gint pop3_stls_send             (Pop3Session *session);
 static gint pop3_stls_recv             (Pop3Session *session);
 #endif
@@ -90,6 +91,7 @@ static gint pop3_session_recv_msg             (Session        *session,
 static gint pop3_session_recv_data_finished    (Session        *session,
                                                 guchar         *data,
                                                 guint           len);
+static void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session);
 
 static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
 {
@@ -99,7 +101,7 @@ static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
        return PS_SUCCESS;
 }
 
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
 static gint pop3_stls_send(Pop3Session *session)
 {
        session->state = POP3_STLS;
@@ -115,11 +117,11 @@ static gint pop3_stls_recv(Pop3Session *session)
        }
        return PS_SUCCESS;
 }
-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */
 
 static gint pop3_getauth_user_send(Pop3Session *session)
 {
-       g_return_val_if_fail(session->user != NULL, -1);
+       cm_return_val_if_fail(session->user != NULL, -1);
 
        session->state = POP3_GETAUTH_USER;
        pop3_gen_send(session, "USER %s", session->user);
@@ -128,7 +130,7 @@ static gint pop3_getauth_user_send(Pop3Session *session)
 
 static gint pop3_getauth_pass_send(Pop3Session *session)
 {
-       g_return_val_if_fail(session->pass != NULL, -1);
+       cm_return_val_if_fail(session->pass != NULL, -1);
 
        session->state = POP3_GETAUTH_PASS;
        pop3_gen_send(session, "PASS %s", session->pass);
@@ -141,8 +143,8 @@ static gint pop3_getauth_apop_send(Pop3Session *session)
        gchar *apop_str;
        gchar md5sum[33];
 
-       g_return_val_if_fail(session->user != NULL, -1);
-       g_return_val_if_fail(session->pass != NULL, -1);
+       cm_return_val_if_fail(session->user != NULL, -1);
+       cm_return_val_if_fail(session->pass != NULL, -1);
 
        session->state = POP3_GETAUTH_APOP;
 
@@ -508,27 +510,35 @@ static void pop3_gen_send(Pop3Session *session, const gchar *format, ...)
        else
                log_print(LOG_PROTOCOL, "POP3> %s\n", buf);
 
-       session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf);
+       session_send_msg(SESSION(session), buf);
 }
 
 Session *pop3_session_new(PrefsAccount *account)
 {
        Pop3Session *session;
 
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
+
+       account->receive_in_progress = TRUE;
 
        session = g_new0(Pop3Session, 1);
 
-       session_init(SESSION(session));
+       session_init(SESSION(session), account, FALSE);
 
        SESSION(session)->type = SESSION_POP3;
 
        SESSION(session)->recv_msg = pop3_session_recv_msg;
        SESSION(session)->recv_data_finished = pop3_session_recv_data_finished;
        SESSION(session)->send_data_finished = NULL;
-
+       SESSION(session)->ssl_cert_auto_accept = account->ssl_certs_auto_accept;
        SESSION(session)->destroy = pop3_session_destroy;
 
+#ifdef USE_GNUTLS
+       if (account->set_gnutls_priority && account->gnutls_priority &&
+                       strlen(account->gnutls_priority) != 0)
+               SESSION(session)->gnutls_priority = g_strdup(account->gnutls_priority);
+#endif
+
        session->state = POP3_READY;
        session->ac_prefs = account;
        session->pop_before_smtp = FALSE;
@@ -545,7 +555,7 @@ static void pop3_session_destroy(Session *session)
        Pop3Session *pop3_session = POP3_SESSION(session);
        gint n;
 
-       g_return_if_fail(session != NULL);
+       cm_return_if_fail(session != NULL);
 
        for (n = 1; n <= pop3_session->count; n++)
                g_free(pop3_session->msg[n].uidl);
@@ -565,9 +575,11 @@ static void pop3_session_destroy(Session *session)
        g_free(pop3_session->user);
        g_free(pop3_session->pass);
        g_free(pop3_session->error_msg);
+
+       pop3_session->ac_prefs->receive_in_progress = FALSE;
 }
 
-void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
+static void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
 {
        GHashTable *table;
        GHashTable *partial_recv_table;
@@ -650,7 +662,7 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
 #define TRY(func) \
 if (!(func)) \
 { \
-       g_warning("failed to write\n"); \
+       g_warning("failed to write"); \
        goto err_write;                 \
 } \
 
@@ -663,9 +675,11 @@ gint pop3_write_uidl_list(Pop3Session *session)
        gchar *sanitized_uid = g_strdup(session->ac_prefs->userid);
        
        subst_for_filename(sanitized_uid);
-       
 
-       if (!session->uidl_is_valid) return 0;
+       if (!session->uidl_is_valid) {
+               g_free(sanitized_uid);
+               return 0;
+       }
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                           "uidl", G_DIR_SEPARATOR_S,
@@ -698,7 +712,7 @@ gint pop3_write_uidl_list(Pop3Session *session)
        }
        fp = NULL;
 #ifdef G_OS_WIN32
-       g_unlink(path);
+       claws_unlink(path);
 #endif
        if (g_rename(tmp_path, path) < 0) {
                FILE_OP_ERROR(path, "rename");
@@ -723,7 +737,7 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
        FILE *fp;
        const gchar *prev, *cur;
 
-       g_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
 
        if ((fp = g_fopen(file, "wb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
@@ -737,7 +751,7 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
                if (fprintf(fp, "%s\n", prefix) < 0) {
                        FILE_OP_ERROR(file, "fprintf");
                        fclose(fp);
-                       g_unlink(file);
+                       claws_unlink(file);
                        return -1;
                }
        }
@@ -751,9 +765,9 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
                if ((cur > prev && fwrite(prev, 1, cur - prev, fp) < 1) ||
                    fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR(file, "fwrite");
-                       g_warning("can't write to file: %s\n", file);
+                       g_warning("can't write to file: %s", file);
                        fclose(fp);
-                       g_unlink(file);
+                       claws_unlink(file);
                        return -1;
                }
 
@@ -777,24 +791,24 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
        if (prev - data < len &&
            fwrite(prev, 1, len - (prev - data), fp) < 1) {
                FILE_OP_ERROR(file, "fwrite");
-               g_warning("can't write to file: %s\n", file);
+               g_warning("can't write to file: %s", file);
                fclose(fp);
-               g_unlink(file);
+               claws_unlink(file);
                return -1;
        }
        if (data[len - 1] != '\r' && data[len - 1] != '\n') {
                if (fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR(file, "fputc");
-                       g_warning("can't write to file: %s\n", file);
+                       g_warning("can't write to file: %s", file);
                        fclose(fp);
-                       g_unlink(file);
+                       claws_unlink(file);
                        return -1;
                }
        }
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(file, "fclose");
-               g_unlink(file);
+               claws_unlink(file);
                return -1;
        }
 
@@ -821,7 +835,8 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
                    msg->recv_time != RECV_TIME_KEEP &&
                    msg->partial_recv == POP3_TOTALLY_RECEIVED &&
                    session->current_time - msg->recv_time >=
-                   ac->msg_leave_time * 24 * 60 * 60) {
+                    ((ac->msg_leave_time * 24 * 60 * 60) +
+                     (ac->msg_leave_hour * 60 * 60))) {
                        log_message(LOG_PROTOCOL, 
                                        _("POP3: Deleting expired message %d [%s]\n"),
                                        session->cur_msg, msg->uidl?msg->uidl:" ");
@@ -878,7 +893,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                        ok = PS_ERROR;
                } else {
                        switch (session->state) {
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
                        case POP3_STLS:
                                log_error(LOG_PROTOCOL, _("couldn't start TLS session\n"));
                                ok = PS_ERROR;
@@ -942,7 +957,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
        case POP3_READY:
        case POP3_GREETING:
                pop3_greeting_recv(pop3_session, body);
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
                if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
                        val = pop3_stls_send(pop3_session);
                else
@@ -952,7 +967,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
                else
                        val = pop3_getauth_user_send(pop3_session);
                break;
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
        case POP3_STLS:
                if (pop3_stls_recv(pop3_session) != PS_SUCCESS)
                        return -1;
@@ -1068,6 +1083,7 @@ static gint pop3_session_recv_data_finished(Session *session, guchar *data,
 
                if (pop3_session->ac_prefs->rmmail &&
                    pop3_session->ac_prefs->msg_leave_time == 0 &&
+                   pop3_session->ac_prefs->msg_leave_hour == 0 &&
                    pop3_session->msg[pop3_session->cur_msg].recv_time
                    != RECV_TIME_KEEP)
                        pop3_delete_send(pop3_session);
Claws Mail