lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

purge imap_store_t::currentnc vestiges

Browse Source 
we always actually open the mailbox before appending to it, so we
obviously know that it exists - that's why the code was already
commented out. changing this assumption would significantly complicate
matters for little gain, so let's just assume it won't happen.

consequently, also don't set param.create when appending to regular
mailboxes.
This commit is contained in:
Oswald Buddenhagen 2010-11-15 10:30:24 +01:00
parent c66afdc0a8
commit 1545ed90a0
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drv_imap.c
View File

@ -115,8 +115,8 @@ struct imap_cmd;
typedef struct imap_store { typedef struct imap_store {
store_t gen; store_t gen;
const char *prefix; const char *prefix;
unsigned /*currentnc:1,*/ trashnc:1;
int uidnext; /* from SELECT responses */ int uidnext; /* from SELECT responses */
unsigned trashnc:1; /* trash folder's existence is not confirmed yet */
unsigned got_namespace:1; unsigned got_namespace:1;
list_t *ns_personal, *ns_other, *ns_shared; /* NAMESPACE info */ list_t *ns_personal, *ns_other, *ns_shared; /* NAMESPACE info */
message_t **msgapp; /* FETCH results */ message_t **msgapp; /* FETCH results */
@ -1540,10 +1540,8 @@ imap_select( store_t *gctx, int minuid, int maxuid, int *excs, int nexcs,
if (!strcmp( gctx->name, "INBOX" )) { if (!strcmp( gctx->name, "INBOX" )) {
// ctx->currentnc = 0;
prefix = ""; prefix = "";
} else { } else {
// ctx->currentnc = 1; /* could use LIST results for that */
prefix = ctx->prefix; prefix = ctx->prefix;
} }
@ -1698,9 +1696,6 @@ imap_store_msg( store_t *gctx, msg_data_t *data, int to_trash,
} else { } else {
box = gctx->name; box = gctx->name;
prefix = !strcmp( box, "INBOX" ) ? "" : ctx->prefix; prefix = !strcmp( box, "INBOX" ) ? "" : ctx->prefix;
cmd->param.create = (gctx->opts & OPEN_CREATE) != 0;
/*if (ctx->currentnc)
ctx->caps = ctx->rcaps & ~(1 << LITERALPLUS);*/
} }
ret = imap_exec_m( ctx, cmd, "APPEND \"%s%s\" %s", prefix, box, flagstr ); ret = imap_exec_m( ctx, cmd, "APPEND \"%s%s\" %s", prefix, box, flagstr );
ctx->caps = ctx->rcaps; ctx->caps = ctx->rcaps;
@ -1708,9 +1703,6 @@ imap_store_msg( store_t *gctx, msg_data_t *data, int to_trash,
return cb( ret, -1, aux ); return cb( ret, -1, aux );
if (to_trash) if (to_trash)
ctx->trashnc = 0; ctx->trashnc = 0;
else {
/*ctx->currentnc = 0;*/
}
return cb( DRV_OK, uid, aux ); return cb( DRV_OK, uid, aux );
} }