2007-04-13 [colin] 2.8.1cvs95
authorColin Leroy <colin@colino.net>
Fri, 13 Apr 2007 06:25:26 +0000 (06:25 +0000)
committerColin Leroy <colin@colino.net>
Fri, 13 Apr 2007 06:25:26 +0000 (06:25 +0000)
* src/pop.c
Add some UIDL debugging

ChangeLog
PATCHSETS
configure.ac
src/pop.c

index 451b689..45b6aec 100644 (file)
--- 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
index 840a65e..8adc20c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 5df4e89..d71a507 100644 (file)
@@ -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=
 
index 370e6b6..5ce354d 100644 (file)
--- 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) {