[asterisk-commits] mmichelson: trunk r78451 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Aug  7 14:44:46 2007
New Revision: 78451

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78451
Log:
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)


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=78451&r1=78450&r2=78451
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Aug  7 14:44:46 2007
@@ -2675,9 +2675,9 @@
 	int newmsgs, oldmsgs;
 	
 	if(inboxcount(mailbox, &newmsgs, &oldmsgs))
+		return 0;
+	else
 		return folder? oldmsgs: newmsgs;
-	else
-		return 0;
 }
 
 static int messagecount(const char *context, const char *mailbox, const char *folder)
@@ -2690,9 +2690,9 @@
 	sprintf(tmp,"%s@%s", mailbox, ast_strlen_zero(context)? "default": context);
 
 	if(inboxcount(tmp, &newmsgs, &oldmsgs))
+		return 0;
+	else
 		return folder? oldmsgs: newmsgs;
-	else
-		return 0;
 }
 
 #endif