[asterisk-commits] Add new object for VoicemailUserEntry (asterisk[master])

[SVN commits to the Asterisk project]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7428 )

Change subject: Add new object for VoicemailUserEntry
......................................................................

Add new object for VoicemailUserEntry

Currently, when the app_voicemail sending VoicemailUserEntry AMI event, there's
no OldMessageCount info for default.
To check the OldMessageCount info, it required IMAP_STORAGE define, but this is
not correct.
Added OldMessageCount item as a default.

ASTERISK-27456

Change-Id: I5c71521c2d1daf8b7b161e31c34d28cca6aea4c7
---
M apps/app_voicemail.c
1 file changed, 4 insertions(+), 7 deletions(-)

Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Sean Bright: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ecd423f..d017301 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -13283,11 +13283,8 @@
 	
 	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 @@
 			"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 @@
 			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;

-- 
To view, visit https://gerrit.asterisk.org/7428
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c71521c2d1daf8b7b161e31c34d28cca6aea4c7
Gerrit-Change-Number: 7428
Gerrit-PatchSet: 1
Gerrit-Owner: sungtae kim <pchero21 at gmail.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20171205/d5230469/attachment.html>