diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-05 19:59:59 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-05 19:59:59 -0600 |
commit | e6439703e8e8674a8fc5844737d6c7b1f3fd72e8 (patch) | |
tree | 0c181e827686d7f3a985f6342753f4ad1cd31687 | |
parent | 47124e97fe0f0786c0f8917ccd254d084dc662f0 (diff) | |
parent | 30db6bb1a0be8747da8e5002753fd0a7f17e8934 (diff) |
Merge "Add new object for VoicemailUserEntry" into 15
-rw-r--r-- | apps/app_voicemail.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index ecd423f86..d01730101 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -13283,11 +13283,8 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa AST_LIST_TRAVERSE(&users, vmu, list) { char dirname[256]; -#ifdef IMAP_STORAGE int new, old; - inboxcount(vmu->mailbox, &new, &old); -#endif make_dir(dirname, sizeof(dirname), vmu->context, vmu->mailbox, "INBOX"); astman_append(s, @@ -13319,8 +13316,8 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa "MaxMessageCount: %d\r\n" "MaxMessageLength: %d\r\n" "NewMessageCount: %d\r\n" -#ifdef IMAP_STORAGE "OldMessageCount: %d\r\n" +#ifdef IMAP_STORAGE "IMAPUser: %s\r\n" "IMAPServer: %s\r\n" "IMAPPort: %s\r\n" @@ -13353,14 +13350,14 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa ast_test_flag(vmu, VM_OPERATOR) ? "Yes" : "No", vmu->maxmsg, vmu->maxsecs, + new, + old #ifdef IMAP_STORAGE - new, old, + , vmu->imapuser, vmu->imapserver, vmu->imapport, vmu->imapflags -#else - count_messages(vmu, dirname) #endif ); ++num_users; |