sync with Hiroyuki's 0.5.0claws2-3

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index 24edcdc85e892a681bb4a04821b4d76e873da115..85791abe09469ab78dae371bbcb37cceee95cbfe 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -99,6 +99,7 @@ static gint connection_check_cb               (Automaton      *atm);
 #endif
 
 static void inc_pop3_recv_func         (SockInfo       *sock,
 #endif
 
 static void inc_pop3_recv_func         (SockInfo       *sock,

+                                        gint            count,

                                         gint            read_bytes,
                                         gpointer        data);
 
                                         gint            read_bytes,
                                         gpointer        data);
 


@@ -664,7 +665,6 @@ static IncState inc_pop3_session_do(IncSession *session)
                SSL_free(sockinfo->ssl);
        }
 #endif
                SSL_free(sockinfo->ssl);
        }
 #endif

-

        automaton_destroy(atm);
 
        return pop3_state->inc_state;
        automaton_destroy(atm);
 
        return pop3_state->inc_state;


@@ -788,7 +788,8 @@ static gint connection_check_cb(Automaton *atm)
 }
 #endif
 
 }
 #endif
 

-static void inc_pop3_recv_func(SockInfo *sock, gint read_bytes, gpointer data)
+static void inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
+                              gpointer data)

 {
        gchar buf[MSGBUFSIZE];
        IncSession *session = (IncSession *)data;
 {
        gchar buf[MSGBUFSIZE];
        IncSession *session = (IncSession *)data;