Merged revisions 249491 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r249491 | tilghman | 2010-02-28 14:50:01 -0600 (Sun, 28 Feb 2010) | 5 lines

  Fix unit test that Alec Davis broke.

  (closes issue #16927)
   Reported by: alecdavis
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@249492 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3278ec79041356e89c3e6060047f9eb240af9d20..1bf8c7700e22efec8180e784972283eaf906ef00 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1816,7 +1816,7 @@ static int __messagecount(const char *context, const char *mailbox, const char *
  */
 static int messagecount(const char *context, const char *mailbox, const char *folder)
 {
-       if (!strcmp(folder, "INBOX")) {
+       if (ast_strlen_zero(folder) || !strcmp(folder, "INBOX")) {
                return __messagecount(context, mailbox, "INBOX") + __messagecount(context, mailbox, "Urgent");
        } else {
                return __messagecount(context, mailbox, folder);
@@ -4860,6 +4860,9 @@ static int has_voicemail(const char *mailbox, const char *folder)
 {
        char tmp[256], *tmp2 = tmp, *box, *context;
        ast_copy_string(tmp, mailbox, sizeof(tmp));
+       if (ast_strlen_zero(folder)) {
+               folder = "INBOX";
+       }
        while ((box = strsep(&tmp2, ",&"))) {
                if ((context = strchr(box, '@')))
                        *context++ = '\0';