2005-09-30 [colin] 1.9.14cvs62

	* src/partial_download.c
		Little logic fix in almost-dead code
	* src/pop.c
		Fix partial download when there's no new mail

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c041057b3a539c5f3dc52248fa8a1b568d8d8f9d..30c8f6a46ef8ab7b3badd1694b2c3976713b0289 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-09-30 [colin]     1.9.14cvs62
+
+       * src/partial_download.c
+               Little logic fix in almost-dead code
+       * src/pop.c
+               Fix partial download when there's no new mail
+

 2005-09-29 [paul]      1.9.14cvs61
 
        * src/plugins/pgpinline/pgpinline.c
 2005-09-29 [paul]      1.9.14cvs61
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index 519df728ce8ef6e39f20f5b3356860f4f7f69f9c..78b29be5eed9b873df35492c8df5cc267c0d945b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -830,3 +830,4 @@
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/gtkaspell.c;  ) > 1.9.14cvs59.patchset
 ( cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 1.9.14cvs60.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpinline/pgpinline.c;  ) > 1.9.14cvs61.patchset
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/gtkaspell.c;  ) > 1.9.14cvs59.patchset
 ( cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 1.9.14cvs60.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpinline/pgpinline.c;  ) > 1.9.14cvs61.patchset

+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/partial_download.c;  cvs diff -u -r 1.56.2.40 -r 1.56.2.41 src/pop.c;  ) > 1.9.14cvs62.patchset

diff --git a/configure.ac b/configure.ac
index 259df42ff1a16b5e1e0eae2556dc24aa7f262660..fa9feb6d6aa5d54ef65efa9008268de8189e0463 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=61
+EXTRA_VERSION=62

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/partial_download.c b/src/partial_download.c
index b515d182993885c4e02e39edddbf4a2b9e5600e3..95fde101dd6858183a717b5dd337c9560baf6ad5 100644 (file)
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -173,8 +173,8 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
                if ((fp = g_fopen(path, "rb")) == NULL) {
                        if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
                        g_free(path);
                if ((fp = g_fopen(path, "rb")) == NULL) {
                        if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
                        g_free(path);

+                       goto bail;

                }
                }

-               goto bail;

        }
 
        pathnew = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
        }
 
        pathnew = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,

diff --git a/src/pop.c b/src/pop.c
index 76d3c720040d4e9faa9319e8fc709db962ef0b5d..a72f037edc1813129b80440aa3c7381503818d69 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -271,7 +271,8 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
                        session->msg[num].received = 
                                (partial_recv != POP3_MUST_COMPLETE_RECV);
                        session->msg[num].partial_recv = partial_recv;
                        session->msg[num].received = 
                                (partial_recv != POP3_MUST_COMPLETE_RECV);
                        session->msg[num].partial_recv = partial_recv;

-
+                       if (partial_recv == POP3_MUST_COMPLETE_RECV)
+                               session->new_msg_exist = TRUE;

                }
                if (!session->new_msg_exist &&
                    (session->ac_prefs->getall || recv_time == RECV_TIME_NONE ||
                }
                if (!session->new_msg_exist &&
                    (session->ac_prefs->getall || recv_time == RECV_TIME_NONE ||