From: Timo Sirainen Date: Sat, 1 Oct 2011 14:55:18 +0000 (+0300) Subject: imapc: Changed imapc_client_mailbox_cmd() parameter order to be same as in _cmdf(). X-Git-Tag: 2.1.beta1~104 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdf00df4dc5d0ae5acfdf200d2e846dbb92fda7e;p=thirdparty%2Fdovecot%2Fcore.git imapc: Changed imapc_client_mailbox_cmd() parameter order to be same as in _cmdf(). --- diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c index ac8e0444d8..b9246b0705 100644 --- a/src/lib-imap-client/imapc-client.c +++ b/src/lib-imap-client/imapc-client.c @@ -345,9 +345,8 @@ imapc_client_mailbox_is_selected(struct imapc_client_mailbox *box, } void imapc_client_mailbox_cmd(struct imapc_client_mailbox *box, - const char *cmd, imapc_command_callback_t *callback, - void *context) + void *context, const char *cmd) { struct imapc_client_command_context *ctx; struct imapc_command_reply reply; diff --git a/src/lib-imap-client/imapc-client.h b/src/lib-imap-client/imapc-client.h index e5a65cee5e..d23aacedd4 100644 --- a/src/lib-imap-client/imapc-client.h +++ b/src/lib-imap-client/imapc-client.h @@ -133,9 +133,8 @@ imapc_client_mailbox_open(struct imapc_client *client, void imapc_client_mailbox_close(struct imapc_client_mailbox **box); void imapc_client_mailbox_disconnect(struct imapc_client_mailbox *box); void imapc_client_mailbox_cmd(struct imapc_client_mailbox *box, - const char *cmd, imapc_command_callback_t *callback, - void *context); + void *context, const char *cmd); void imapc_client_mailbox_cmdf(struct imapc_client_mailbox *box, imapc_command_callback_t *callback, void *context, const char *cmd_fmt, ...) diff --git a/src/lib-storage/index/imapc/imapc-mail-fetch.c b/src/lib-storage/index/imapc/imapc-mail-fetch.c index 42a77e2105..ca51d84fcd 100644 --- a/src/lib-storage/index/imapc/imapc-mail-fetch.c +++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c @@ -102,9 +102,9 @@ imapc_mail_send_fetch(struct mail *_mail, enum mail_fetch_field fields) if (mail->fetch_count++ == 0) array_append(&mbox->fetch_mails, &mail, 1); - imapc_client_mailbox_cmdf(mbox->client_box, - imapc_mail_prefetch_callback, - mail, "%1s", str_c(str)); + imapc_client_mailbox_cmd(mbox->client_box, + imapc_mail_prefetch_callback, + mail, str_c(str)); mail->imail.data.prefetch_sent = TRUE; return 0; } diff --git a/src/lib-storage/index/imapc/imapc-mail.c b/src/lib-storage/index/imapc/imapc-mail.c index e2cd3a76f4..2a891337a1 100644 --- a/src/lib-storage/index/imapc/imapc-mail.c +++ b/src/lib-storage/index/imapc/imapc-mail.c @@ -74,8 +74,8 @@ static bool imapc_mail_is_expunged(struct mail *_mail) /* we may be running against a server that hasn't bothered sending us an EXPUNGE. see if NOOP sends it. */ imapc_simple_context_init(&sctx, mbox->storage); - imapc_client_mailbox_cmdf(mbox->client_box, - imapc_simple_callback, &sctx, "NOOP"); + imapc_client_mailbox_cmd(mbox->client_box, + imapc_simple_callback, &sctx, "NOOP"); imapc_simple_run(&sctx); return !imapc_msgmap_uid_to_rseq(msgmap, _mail->uid, &rseq); diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c index 4588643363..19014f1c7e 100644 --- a/src/lib-storage/index/imapc/imapc-storage.c +++ b/src/lib-storage/index/imapc/imapc-storage.c @@ -614,8 +614,8 @@ static int imapc_mailbox_get_metadata(struct mailbox *box, static void imapc_idle_timeout(struct imapc_mailbox *mbox) { - imapc_client_mailbox_cmd(mbox->client_box, "NOOP", - imapc_noop_callback, mbox->storage); + imapc_client_mailbox_cmd(mbox->client_box, + imapc_noop_callback, mbox->storage, "NOOP"); } static void imapc_idle_noop_callback(const struct imapc_command_reply *reply, @@ -645,8 +645,9 @@ static void imapc_notify_changes(struct mailbox *box) don't notice changes immediately, we'll force them to check here by sending a NOOP. this helps with clients that break IDLE when clicking "get mail". */ - imapc_client_mailbox_cmd(mbox->client_box, "NOOP", - imapc_idle_noop_callback, mbox); + imapc_client_mailbox_cmd(mbox->client_box, + imapc_idle_noop_callback, mbox, + "NOOP"); } else { /* remote server doesn't support IDLE. check for changes with NOOP every once in a while. */ diff --git a/src/lib-storage/index/imapc/imapc-sync.c b/src/lib-storage/index/imapc/imapc-sync.c index 0a7c023987..3885bbc412 100644 --- a/src/lib-storage/index/imapc/imapc-sync.c +++ b/src/lib-storage/index/imapc/imapc-sync.c @@ -39,8 +39,8 @@ static void imapc_sync_callback(const struct imapc_command_reply *reply, static void imapc_sync_cmd(struct imapc_sync_context *ctx, const char *cmd) { ctx->sync_command_count++; - imapc_client_mailbox_cmd(ctx->mbox->client_box, cmd, - imapc_sync_callback, ctx); + imapc_client_mailbox_cmd(ctx->mbox->client_box, + imapc_sync_callback, ctx, cmd); } static void @@ -400,9 +400,9 @@ imapc_mailbox_sync_init(struct mailbox *box, enum mailbox_sync_flags flags) if ((capabilities & IMAPC_CAPABILITY_IDLE) == 0) { /* IDLE not supported. do NOOP to get latest changes before starting sync. */ - imapc_client_mailbox_cmdf(mbox->client_box, - imapc_noop_stop_callback, - mbox->storage, "NOOP"); + imapc_client_mailbox_cmd(mbox->client_box, + imapc_noop_stop_callback, + mbox->storage, "NOOP"); imapc_storage_run(mbox->storage); }