don't translate strings in debug_print(), log_print(), log_message(), and log_warning()

[claws.git] / src / pop.c

diff --git a/src/pop.c b/src/pop.c
index 2fd15a9b6bb9e4d49a89f094fda600afb62934c5..637421c4bea343dca6b9d4b8afc24b6cf9176d1b 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-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * 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
@@ -35,7 +35,6 @@
 #include "md5.h"
 #include "prefs_account.h"
 #include "utils.h"
-#include "inc.h"
 #include "recv.h"
 
 #include "log.h"
@@ -148,14 +147,14 @@ static gint pop3_getauth_apop_send(Pop3Session *session)
        session->state = POP3_GETAUTH_APOP;
 
        if ((start = strchr(session->greeting, '<')) == NULL) {
-               log_warning(_("Required APOP timestamp not found "
-                             "in greeting\n"));
+               log_warning("Required APOP timestamp not found "
+                           "in greeting\n");
                session->error_val = PS_PROTOCOL;
                return -1;
        }
 
        if ((end = strchr(start, '>')) == NULL || end == start + 1) {
-               log_warning(_("Timestamp syntax error in greeting\n"));
+               log_warning("Timestamp syntax error in greeting\n");
                session->error_val = PS_PROTOCOL;
                return -1;
        }
@@ -181,7 +180,7 @@ static gint pop3_getrange_stat_send(Pop3Session *session)
 static gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg)
 {
        if (sscanf(msg, "%d %d", &session->count, &session->total_bytes) != 2) {
-               log_warning(_("POP3 protocol error\n"));
+               log_warning("POP3 protocol error\n");
                session->error_val = PS_PROTOCOL;
                return -1;
        } else {
@@ -208,7 +207,7 @@ static gint pop3_getrange_last_recv(Pop3Session *session, const gchar *msg)
        gint last;
 
        if (sscanf(msg, "%d", &last) == 0) {
-               log_warning(_("POP3 protocol error\n"));
+               log_warning("POP3 protocol error\n");
                session->error_val = PS_PROTOCOL;
                return -1;
        } else {
@@ -345,7 +344,7 @@ static gint pop3_retr_recv(Pop3Session *session, const gchar *data, guint len)
        g_free(mail_receive_data.data);
 
        /* drop_ok: 0: success 1: don't receive -1: error */
-       drop_ok = inc_drop_message(file, session);
+       drop_ok = session->drop_message(session, file);
        g_free(file);
        if (drop_ok < 0) {
                session->error_val = PS_IOERR;
@@ -625,7 +624,7 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
                    msg->recv_time != RECV_TIME_KEEP &&
                    session->current_time - msg->recv_time >=
                    ac->msg_leave_time * 24 * 60 * 60) {
-                       log_print(_("POP3: Deleting expired message %d\n"),
+                       log_print("POP3: Deleting expired message %d\n",
                                  session->cur_msg);
                        pop3_delete_send(session);
                        return POP3_DELETE;
@@ -633,7 +632,7 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
 
                if (size_limit_over)
                        log_print
-                               (_("POP3: Skipping message %d (%d bytes)\n"),
+                               ("POP3: Skipping message %d (%d bytes)\n",
                                  session->cur_msg, size);
 
                if (size == 0 || msg->received || size_limit_over) {
@@ -664,32 +663,32 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                    strstr(msg + 4, "Lock") ||
                    strstr(msg + 4, "LOCK") ||
                    strstr(msg + 4, "wait")) {
-                       log_warning(_("mailbox is locked\n"));
+                       log_warning("mailbox is locked\n");
                        ok = PS_LOCKBUSY;
                } else if (strcasestr(msg + 4, "timeout")) {
-                       log_warning(_("session timeout\n"));
+                       log_warning("session timeout\n");
                        ok = PS_ERROR;
                } else {
                        switch (session->state) {
 #if USE_OPENSSL
                        case POP3_STLS:
-                               log_warning(_("can't start TLS session\n"));
+                               log_warning("can't start TLS session\n");
                                ok = PS_ERROR;
                                break;
 #endif
                        case POP3_GETAUTH_USER:
                        case POP3_GETAUTH_PASS:
                        case POP3_GETAUTH_APOP:
-                               log_warning(_("error occurred on authentication\n"));
+                               log_warning("error occurred on authentication\n");
                                ok = PS_AUTHFAIL;
                                break;
                        case POP3_GETRANGE_LAST:
                        case POP3_GETRANGE_UIDL:
-                               log_warning(_("command not supported\n"));
+                               log_warning("command not supported\n");
                                ok = PS_NOTSUPPORTED;
                                break;
                        default:
-                               log_warning(_("error occurred on POP3 session\n"));
+                               log_warning("error occurred on POP3 session\n");
                                ok = PS_ERROR;
                        }
                }