Mail fixes and libetpan updated

2 files changed, 2 insertions, 2 deletions

diff --git a/kmicromail/libetpan/imap/mailimap.c b/kmicromail/libetpan/imap/mailimap.c
index c8fbfee..76d9454 100644
--- a/kmicromail/libetpan/imap/mailimap.c
+++ b/kmicromail/libetpan/imap/mailimap.c
@@ -1878,65 +1878,65 @@ int mailimap_subscribe(mailimap * session, const char * mb)
 
   r = parse_response(session, &response);
   if (r != MAILIMAP_NO_ERROR)
     return r;
 
   error_code = response->rsp_resp_done->rsp_data.rsp_tagged->rsp_cond_state->rsp_type;
 
   mailimap_response_free(response);
 
   switch (error_code) {
   case MAILIMAP_RESP_COND_STATE_OK:
     return MAILIMAP_NO_ERROR;
 
   default:
     return MAILIMAP_ERROR_SUBSCRIBE;
   }
 }
 
 int mailimap_unsubscribe(mailimap * session, const char * mb)
 {
   struct mailimap_response * response;
   int r;
   int error_code;
 
   if ((session->imap_state != MAILIMAP_STATE_AUTHENTICATED) &&
       (session->imap_state != MAILIMAP_STATE_SELECTED))
     return MAILIMAP_ERROR_BAD_STATE;
 
   r = send_current_tag(session);
   if (r != MAILIMAP_NO_ERROR)
     return r;
 
-  r = mailimap_subscribe_send(session->imap_stream, mb);
+  r = mailimap_unsubscribe_send(session->imap_stream, mb);
   if (r != MAILIMAP_NO_ERROR)
     return r;
 
   r = mailimap_crlf_send(session->imap_stream);
   if (r != MAILIMAP_NO_ERROR)
     return r;
 
   if (mailstream_flush(session->imap_stream) == -1)
     return MAILIMAP_ERROR_STREAM;
 
   if (read_line(session) == NULL)
     return MAILIMAP_ERROR_STREAM;
 
   r = parse_response(session, &response);
   if (r != MAILIMAP_NO_ERROR)
     return r;
 
   error_code = response->rsp_resp_done->rsp_data.rsp_tagged->rsp_cond_state->rsp_type;
 
   mailimap_response_free(response);
 
   switch (error_code) {
   case MAILIMAP_RESP_COND_STATE_OK:
     return MAILIMAP_NO_ERROR;
 
   default:
     return MAILIMAP_ERROR_UNSUBSCRIBE;
   }
 }
 
 
 int mailimap_starttls(mailimap * session)
diff --git a/kmicromail/libetpan/imap/mailimap_keywords.c b/kmicromail/libetpan/imap/mailimap_keywords.c
index b277aed..4ec156e 100644
--- a/kmicromail/libetpan/imap/mailimap_keywords.c
+++ b/kmicromail/libetpan/imap/mailimap_keywords.c
@@ -24,65 +24,65 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Id$
  */
 
 #include "mailimap_keywords.h"
 #include "mailimap_types.h"
 #include <string.h>
 #include <stdio.h>
 
 #ifndef UNSTRICT_SYNTAX
 #define UNSTRICT_SYNTAX
 #endif
 
 struct mailimap_token_value {
   int value;
   const char * str;
 };
 
 int mailimap_token_case_insensitive_parse(mailstream * fd,
 					  MMAPString * buffer,
 					  size_t * index,
 					  const char * token)
 {
   int len;
-  int cur_token;
+  size_t cur_token;
   int r;
 
   cur_token = * index;
   len = strlen(token);
 
 #ifdef UNSTRICT_SYNTAX
   r = mailimap_space_parse(fd, buffer, &cur_token);
   if ((r != MAILIMAP_NO_ERROR) && (r != MAILIMAP_ERROR_PARSE))
     return r;
 #endif
 
   if (strncasecmp(buffer->str + cur_token, token, len) == 0) {
     cur_token += len;
     * index = cur_token;
     return MAILIMAP_NO_ERROR;
   }
   else
     return MAILIMAP_ERROR_PARSE;
 }
 
 
 static int is_space_or_tab(char ch)
 {
   return (ch == ' ') || (ch == '\t');
 }
 
 int mailimap_char_parse(mailstream * fd, MMAPString * buffer,
 			size_t * index, char token)
 {
   int cur_token;
 
   cur_token = * index;