From 3c852c41e893c549acd08512a73c44133fe00a81 Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Sat, 7 Aug 2004 15:38:03 +0000
Subject: [PATCH] 		fix warnings

---
 ChangeLog.claws               | 6 ++++++
 PATCHSETS                     | 1 +
 configure.ac                  | 2 +-
 src/common/partial_download.c | 6 +++---
 src/pop.c                     | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6a2fd9285..af49e8831 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-08-07 [colin]	0.9.12cvs50
+
+	* src/pop.c
+	* src/common/partial_download.c
+		fix warnings
+
 2004-08-07 [colin]	0.9.12cvs49
 
 	* src/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
index c61ab5764..c969b0e2f 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -31,3 +31,4 @@
 ( cvs diff -u -r 1.431 -r 1.432 src/compose.c; ) > 0.9.12cvs47.patchset
 ( cvs diff -u -r 1.62 -r 1.63 src/prefs_folder_item.c; ) > 0.9.12cvs48.patchset
 ( cvs diff -u -r 1.182 -r 1.183 src/Makefile.am; cvs diff -u -r 1.69 -r 1.70 src/account.c; cvs diff -u -r 1.69 -r 1.70 src/addressbook.c; cvs diff -u -r 1.19 -r 1.20 src/alertpanel.c; cvs diff -u -r 1.5 -r 1.6 src/alertpanel.h; cvs diff -u -r 1.432 -r 1.433 src/compose.c; cvs diff -u -r 1.3 -r 1.4 src/exphtmldlg.c; cvs diff -u -r 1.1 -r 1.2 src/expldifdlg.c; cvs diff -u -r 1.136 -r 1.137 src/main.c; cvs diff -u -r 1.3 -r 1.4 src/message_search.c; cvs diff -u -r 1.123 -r 1.124 src/messageview.c; cvs diff -u -r 1.66 -r 1.67 src/pop.c; cvs diff -u -r 1.14 -r 1.15 src/sgpgme.c; cvs diff -u -r 1.17 -r 1.18 src/summary_search.c; cvs diff -u -r 1.441 -r 1.442 src/summaryview.c; cvs diff -u -r 1.122 -r 1.123 src/textview.c; cvs diff -u -r 1.9 -r 1.10 src/gtk/sslcertwindow.c; cvs diff -u -r 0 -r 1 src/pixmaps/stock_dialog-error.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/stock_dialog-info.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/stock_dialog-question.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/stock_dialog-warning.xpm; ) > 0.9.12cvs49.patchset
+( cvs diff -u -r 1.67 -r 1.68 src/pop.c; cvs diff -u -r 1.3 -r 1.4 src/common/partial_download.c; ) > 0.9.12cvs50.patchset
diff --git a/configure.ac b/configure.ac
index 3cc507d28..6802f96c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/common/partial_download.c b/src/common/partial_download.c
index 7520e0f16..1599d1a44 100644
--- a/src/common/partial_download.c
+++ b/src/common/partial_download.c
@@ -103,7 +103,7 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo)
 		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\t%ld\t%s", uidl, &recv_time, tmp) < 2) {
 			if (sscanf(buf, "%s", uidl) != 1)
 				continue;
 			else {
@@ -184,7 +184,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
 		sprintf(partial_recv,"0");
 		
 		if (sscanf(buf, "%s\t%ld\t%s", 
-			   uidl, &recv_time, &partial_recv) < 2) {
+			   uidl, &recv_time, partial_recv) < 2) {
 			if (sscanf(buf, "%s", uidl) != 1)
 				continue;
 			else {
@@ -347,7 +347,7 @@ gchar *partial_get_filename(const gchar *server, const gchar *login,
 		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\t%ld\t%s", uidl, &recv_time, tmp) < 2) {
 			if (sscanf(buf, "%s", uidl) != 1)
 				continue;
 			else {
diff --git a/src/pop.c b/src/pop.c
index 6fbd6edb1..e1b75be34 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -266,7 +266,7 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
 		partial_recv = (gint)g_hash_table_lookup(
 					session->partial_recv_table, id);
 
-		if (!session->ac_prefs->getall && recv_time != RECV_TIME_NONE
+		if ((!session->ac_prefs->getall && recv_time != RECV_TIME_NONE)
 		||  partial_recv != POP3_TOTALLY_RECEIVED) {
 			session->msg[num].received = 
 				(partial_recv != POP3_MUST_COMPLETE_RECV);
@@ -583,7 +583,7 @@ 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) < 3) {
+		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;
-- 
2.25.1