From: DINH V. Ho? <ho...@us...> - 2002-03-12 23:24:33
|
Update of /cvsroot/libetpan/libetpan/imap In directory usw-pr-cvs1:/tmp/cvs-serv9693/imap Modified Files: mailimap.c mailimap_helper.c mailimap_helper.h Log Message: generic interfaces - bug fixes Index: mailimap.c =================================================================== RCS file: /cvsroot/libetpan/libetpan/imap/mailimap.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mailimap.c 10 Mar 2002 20:44:24 -0000 1.5 +++ mailimap.c 12 Mar 2002 23:24:29 -0000 1.6 @@ -476,7 +476,8 @@ struct mailimap_continue_req * cont_req; gint index; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -505,17 +506,6 @@ return MAILIMAP_ERROR_APPEND; } - /* - handling prog_rate - - count += strlen(line); - if ((size != 0) && (progr_rate != 0) && (progr_fun != NULL)) - if (count - last >= progr_rate) { - (* progr_fun)(count, size); - last = count; - } - */ - if (!mailimap_literal_data_send(session->stream, literal, literal_size)) return MAILIMAP_ERROR_COULD_NOT_SEND_REQUEST; @@ -962,7 +952,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1003,7 +994,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1043,7 +1035,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1189,7 +1182,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1274,7 +1268,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1323,7 +1318,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1454,7 +1450,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1505,7 +1502,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1635,7 +1633,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) @@ -1675,7 +1674,8 @@ gint r; gint error_code; - if (session->state != MAILIMAP_STATE_AUTHENTICATED) + if ((session->state != MAILIMAP_STATE_AUTHENTICATED) && + (session->state != MAILIMAP_STATE_SELECTED)) return MAILIMAP_ERROR_BAD_STATE; if (!send_current_tag(session)) Index: mailimap_helper.c =================================================================== RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_helper.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mailimap_helper.c 10 Feb 2002 20:48:15 -0000 1.3 +++ mailimap_helper.c 12 Mar 2002 23:24:29 -0000 1.4 @@ -151,12 +151,6 @@ return MAILIMAP_NO_ERROR; } -gint mailimap_list_wildcard(mailimap * session, gchar * wildcard, - GList ** result) -{ - return mailimap_list(session, "", TRUE, wildcard, result); -} - gint mailimap_append_simple(mailimap * session, gchar * mailbox, gchar * content, guint32 size) { Index: mailimap_helper.h =================================================================== RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_helper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mailimap_helper.h 21 Feb 2002 06:58:13 -0000 1.4 +++ mailimap_helper.h 12 Mar 2002 23:24:29 -0000 1.5 @@ -38,9 +38,6 @@ guint32 first, guint32 last, GList ** result); -gint mailimap_list_wildcard(mailimap * session, gchar * wildcard, - GList ** result); - gint mailimap_append_simple(mailimap * session, gchar * mailbox, gchar * content, guint32 size); |