fix uidl-file parsing when transitioning
authorColin Leroy <colin@colino.net>
Mon, 26 Jul 2004 20:23:59 +0000 (20:23 +0000)
committerColin Leroy <colin@colino.net>
Mon, 26 Jul 2004 20:23:59 +0000 (20:23 +0000)
ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/pop.c

index 72c53c4f3dadc5eacebdcf8b8fd3dc638bf42055..d93f1c761e6d05959ab0104e3922af81cf67a628 100644 (file)
@@ -1,3 +1,9 @@
+2004-07-26 [colin]     0.9.12cvs33.26
+
+       * src/pop.c
+               Fix uidl-file parsing when not in new
+               format
+
 2004-07-26 [colin]     0.9.12cvs33.25
 
        * src/gtk/menu.c
index 406aeb5d4ee6531fe4c7570a9cb1a83e2bce231d..942b02a1245f471c47e7849537c2a45dafc4507e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -79,3 +79,4 @@
 ( cvs diff -u -r 1.58.2.2 -r 1.58.2.3 po/de.po; cvs diff -u -r 1.60.2.2 -r 1.60.2.3 po/es.po; cvs diff -u -r 1.42.2.2 -r 1.42.2.3 po/fr.po; cvs diff -u -r 1.34 -r 1.35 po/it.po; cvs diff -u -r 1.16.2.1 -r 1.16.2.2 po/ja.po; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 po/pl.po; cvs diff -u -r 1.17 -r 1.18 po/ru.po; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 po/sk.po; cvs diff -u -r 1.17.2.2 -r 1.17.2.3 po/sr.po; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 po/zh_CN.po; ) > 0.9.12cvs33.23.patchset
 ( cvs diff -u -r 1.17.2.2 -r 1.17.2.3 src/alertpanel.c; ) > 0.9.12cvs33.24.patchset
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/menu.c; cvs diff -u -r 1.274.2.12 -r 1.274.2.13 src/mainwindow.c; ) > 0.9.12cvs33.25.patchset
+( cvs diff -u -r 1.56.2.20 -r 1.56.2.21 src/pop.c; ) > 0.9.12cvs33.26.patchset
index b53ee9f65cb5ef027c0b1b8f42c05c8f5cceef1c..4036e6ab4e9bb91884620a3fc7dfa528600a759d 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=33
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.25
+EXTRA_GTK2_VERSION=.26
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 66681a9ccb618016e751efbf2f4c320db436d087..f3f460a6546fb45e8d4f1a57b7ca1a903aa338ee 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -582,13 +582,19 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
                recv_time = RECV_TIME_NONE;
                partial_recv = POP3_TOTALLY_RECEIVED;
                
-               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 2) {
-                       if (sscanf(buf, "%s", uidl) != 1)
-                               continue;
-                       else {
-                               recv_time = now;
+               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 3) {
+                       if (sscanf(buf, "%s\t%ld", uidl, &recv_time) != 2) {
+                               if (sscanf(buf, "%s", uidl) != 1)
+                                       continue;
+                               else {
+                                       recv_time = now;
+                                       strcpy(tmp, "0");
+                               }
+                       } else {
+                               strcpy(tmp, "0");
                        }
                }
+
                if (recv_time == RECV_TIME_NONE)
                        recv_time = RECV_TIME_RECEIVED;
                g_hash_table_insert(table, g_strdup(uidl),