fix warnings

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6a2fd92858f382a9c8294499cd56617b194f9562..af49e8831e1a5a559e4ea5fd7123ea8818b23ef9 100644 (file)
--- 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
 2004-08-07 [colin]     0.9.12cvs49
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index c61ab5764c7196ddf984f22a6b12ee1680187aee..c969b0e2ff050c5a78d3551d8dd5863649cc0209 100644 (file)
--- 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.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 3cc507d28cd5a49fe4a2d6964beb57dd2d06b5f8..6802f96c306ad77f65a3b1bf52350b67fb696741 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 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 7520e0f16118d6c7f0206959d169af4d0895de0a..1599d1a444e23001e824e4017e6aeedc51b113dd 100644 (file)
--- 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;
                
                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 {
                        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", 
                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 {
                        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;
                
                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 {
                        if (sscanf(buf, "%s", uidl) != 1)
                                continue;
                        else {

diff --git a/src/pop.c b/src/pop.c
index 6fbd6edb1d4dc6f8dcd6aa92d1833091b9d9d0b4..e1b75be34af74047b36dd78468e27ba27d789623 100644 (file)
--- 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);
 
                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);
                ||  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;
                
                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;
                        if (sscanf(buf, "%s\t%ld", uidl, &recv_time) != 2) {
                                if (sscanf(buf, "%s", uidl) != 1)
                                        continue;