[asterisk-commits] jrose: trunk r364785 - in /trunk: ./ main/app.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue May  1 13:29:58 2012
New Revision: 364785

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364785
Log:
Fix bad check in voicemail functions for ast_inboxcount2_func

Check looks for ast_inboxcount_func instead of ast_inboxcount2_func on
ast_inboxcount2_func calls.

(closes issue ASTERISK-19718)
Reported by: Corey Farrell
Patches:
	ast_app_inboxcount2-null-refcheck.patch uploaded by Corey Farrell (license 5909)
........

Merged revisions 364769 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 364777 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/app.c

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

Modified: trunk/main/app.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/app.c?view=diff&rev=364785&r1=364784&r2=364785
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Tue May  1 13:29:58 2012
@@ -492,7 +492,7 @@
 	if (urgentmsgs) {
 		*urgentmsgs = 0;
 	}
-	if (ast_inboxcount_func) {
+	if (ast_inboxcount2_func) {
 		return ast_inboxcount2_func(mailbox, urgentmsgs, newmsgs, oldmsgs);
 	}