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

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Nov  5 16:13:37 2009
New Revision: 228197

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

........
  r228196 | tilghman | 2009-11-05 16:12:45 -0600 (Thu, 05 Nov 2009) | 2 lines
  
  Yet another error message in the dialplan (thanks, rmudgett/russellb)
........

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=228197&r1=228196&r2=228197
==============================================================================
--- branches/1.6.1/apps/app_meetme.c (original)
+++ branches/1.6.1/apps/app_meetme.c Thu Nov  5 16:13:37 2009
@@ -5821,7 +5821,8 @@
 	if (result > -1) {
 		snprintf(buf, len, "%d", result);
 	} else if (result == -1) {
-		snprintf(buf, len, "%s %s", "Error: invalid keyword:", args.keyword);
+		ast_log(LOG_NOTICE, "Error: invalid keyword: '%s'\n", args.keyword);
+		snprintf(buf, len, "0");
 	} else if (result == -2) {
 		ast_log(LOG_NOTICE, "Error: conference (%s) not found\n", args.confno); 
 		snprintf(buf, len, "0");