From 2aa705ab5896701f12335c033683deaa0e34c660 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 13 Apr 2007 06:25:26 +0000 Subject: [PATCH] 2007-04-13 [colin] 2.8.1cvs95 * src/pop.c Add some UIDL debugging --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/pop.c | 17 +++++++++++++---- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 451b68928..45b6aecf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-13 [colin] 2.8.1cvs95 + + * src/pop.c + Add some UIDL debugging + 2007-04-12 [colin] 2.8.1cvs94 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index 840a65edb..8adc20cc8 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2511,3 +2511,4 @@ ( cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/common/defs.h; ) > 2.8.1cvs92.patchset ( cvs diff -u -r 1.115.2.151 -r 1.115.2.152 src/main.c; ) > 2.8.1cvs93.patchset ( cvs diff -u -r 1.213.2.140 -r 1.213.2.141 src/folder.c; ) > 2.8.1cvs94.patchset +( cvs diff -u -r 1.56.2.49 -r 1.56.2.50 src/pop.c; ) > 2.8.1cvs95.patchset diff --git a/configure.ac b/configure.ac index 5df4e8968..d71a507f3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=94 +EXTRA_VERSION=95 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/pop.c b/src/pop.c index 370e6b6a5..5ce354def 100644 --- a/src/pop.c +++ b/src/pop.c @@ -263,6 +263,12 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data, session->uidl_table, id); session->msg[num].recv_time = recv_time; + if (recv_time != RECV_TIME_NONE) { + debug_print("num %d uidl %s: already got it\n", num, id); + } else { + debug_print("num %d uidl %s: unknown\n", num, id); + } + partial_recv = (gint)g_hash_table_lookup( session->partial_recv_table, id); @@ -330,6 +336,9 @@ static gint pop3_getsize_list_recv(Pop3Session *session, const gchar *data, static gint pop3_retr_send(Pop3Session *session) { session->state = POP3_RETR; + debug_print("retrieving %d [%s]\n", session->cur_msg, + session->msg[session->cur_msg].uidl ? + session->msg[session->cur_msg].uidl:" "); pop3_gen_send(session, "RETR %d", session->cur_msg); return PS_SUCCESS; } @@ -805,8 +814,8 @@ static Pop3State pop3_lookup_next(Pop3Session *session) session->current_time - msg->recv_time >= ac->msg_leave_time * 24 * 60 * 60) { log_message(LOG_PROTOCOL, - _("POP3: Deleting expired message %d\n"), - session->cur_msg); + _("POP3: Deleting expired message %d [%s]\n"), + session->cur_msg, msg->uidl?msg->uidl:" "); session->cur_total_bytes += size; pop3_delete_send(session); return POP3_DELETE; @@ -821,8 +830,8 @@ static Pop3State pop3_lookup_next(Pop3Session *session) break; log_message(LOG_PROTOCOL, - _("POP3: Skipping message %d (%d bytes)\n"), - session->cur_msg, size); + _("POP3: Skipping message %d [%s] (%d bytes)\n"), + session->cur_msg, msg->uidl?msg->uidl:" ", size); } if (size == 0 || msg->received || size_limit_over) { -- 2.25.1