[asterisk-commits] rmudgett: trunk r371951 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Aug 29 17:40:18 2012
New Revision: 371951

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371951
Log:
Fix compile errors.
........

Merged revisions 371950 from http://svn.asterisk.org/svn/asterisk/branches/11

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

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

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=371951&r1=371950&r2=371951
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Aug 29 17:40:18 2012
@@ -1148,11 +1148,11 @@
 	int res = -1;
 
 	ast_test_suite_event_notify("CONFPLAY", "Channel: %s\r\n"
-									"Conference: %s\r\n"
-									"Marked: %d",
-									chan->name,
-									conf->confno,
-									conf->markedusers);
+		"Conference: %s\r\n"
+		"Marked: %d",
+		ast_channel_name(chan),
+		conf->confno,
+		conf->markedusers);
 
 	if (!ast_check_hangup(chan))
 		res = ast_autoservice_start(chan);
@@ -4607,7 +4607,7 @@
 							/* Prompt user for pin if pin is required */
 							ast_test_suite_event_notify("PLAYBACK", "Message: conf-getpin\r\n"
 								"Channel: %s",
-								chan->name);
+								ast_channel_name(chan));
 							res = ast_app_getdata(chan, "conf-getpin", pin + strlen(pin), sizeof(pin) - 1 - strlen(pin), 0);
 						}
 						if (res >= 0) {