[asterisk-commits] tilghman: branch 1.6.1 r228193 - in /branches/1.6.1: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Nov  5 15:26:13 2009
New Revision: 228193

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228193
Log:
Merged revisions 228191 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r228191 | tilghman | 2009-11-05 15:24:21 -0600 (Thu, 05 Nov 2009) | 7 lines
  
  MEETME_INFO should not return a literal error message to the dialplan.
  (closes issue #15450)
   Reported by: JimVanM
   Patches: 
         meetmeinfopatch.diff.txt uploaded by dbrooks (license 790)
   Tested by: JimVanM
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_meetme.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_meetme.c?view=diff&rev=228193&r1=228192&r2=228193
==============================================================================
--- branches/1.6.1/apps/app_meetme.c (original)
+++ branches/1.6.1/apps/app_meetme.c Thu Nov  5 15:26:13 2009
@@ -5823,7 +5823,8 @@
 	} else if (result == -1) {
 		snprintf(buf, len, "%s %s", "Error: invalid keyword:", args.keyword);
 	} else if (result == -2) {
-		snprintf(buf, len, "Error: conference (%s) not found", args.confno);
+		ast_log(LOG_NOTICE, "Error: conference (%s) not found\n", args.confno); 
+		snprintf(buf, len, "0");
 	}
 
 	return 0;