diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 19:44:46 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 19:44:46 +0000 |
| commit | 6959a3e059dd70de1a35ef65682429a93e0475f8 (patch) | |
| tree | ffa7b23820d690ba05a71a7a241ead5d3501f326 /apps | |
| parent | dd628b516c8859bac23a392328dadd88f48b0f67 (diff) | |
Merged revisions 78450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r78450 | mmichelson | 2007-08-07 14:43:57 -0500 (Tue, 07 Aug 2007) | 5 lines
The logic behind inboxcount's return value was reversed in has_voicemail and message_count.
(closes issue #10401, reported by st1710, patched by me)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@78451 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index d4e7ea4ef..ae2fa2f94 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2675,9 +2675,9 @@ static int has_voicemail(const char *mailbox, const char *folder) int newmsgs, oldmsgs; if(inboxcount(mailbox, &newmsgs, &oldmsgs)) - return folder? oldmsgs: newmsgs; - else return 0; + else + return folder? oldmsgs: newmsgs; } static int messagecount(const char *context, const char *mailbox, const char *folder) @@ -2690,9 +2690,9 @@ static int messagecount(const char *context, const char *mailbox, const char *fo sprintf(tmp,"%s@%s", mailbox, ast_strlen_zero(context)? "default": context); if(inboxcount(tmp, &newmsgs, &oldmsgs)) - return folder? oldmsgs: newmsgs; - else return 0; + else + return folder? oldmsgs: newmsgs; } #endif |