[asterisk-commits] mnicholson: branch 1.6.2 r220905 - in /branches/1.6.2: ./ apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Tue Sep 29 14:49:50 2009
New Revision: 220905

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

........
  r220904 | mnicholson | 2009-09-29 14:49:02 -0500 (Tue, 29 Sep 2009) | 5 lines
  
  Fix options 'm' and 's'. They were swapped in the code.  Also document the fact that app_confbridge does not automatically answer the channel.
  
  (closes issue #15964)
  Reported by: shrift
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_confbridge.c

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

Modified: branches/1.6.2/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_confbridge.c?view=diff&rev=220905&r1=220904&r2=220905
==============================================================================
--- branches/1.6.2/apps/app_confbridge.c (original)
+++ branches/1.6.2/apps/app_confbridge.c Tue Sep 29 14:49:50 2009
@@ -97,6 +97,7 @@
                 <description>
                         <para>Enters the user into a specified conference bridge. The user can exit the conference by hangup only.</para>
                         <para>The join sound can be set using the <literal>CONFBRIDGE_JOIN_SOUND</literal> variable and the leave sound can be set using the <literal>CONFBRIDGE_LEAVE_SOUND</literal> variable. These can be unique to the caller.</para>
+			<note>This application will not automatically answer the channel.</note>
                 </description>
         </application>
 ***/
@@ -135,10 +136,10 @@
 	AST_APP_OPTION('A', OPTION_MARKEDUSER),
 	AST_APP_OPTION('a', OPTION_ADMIN),
 	AST_APP_OPTION('c', OPTION_ANNOUNCEUSERCOUNT),
-	AST_APP_OPTION('m', OPTION_MENU),
+	AST_APP_OPTION('m', OPTION_STARTMUTED),
 	AST_APP_OPTION_ARG('M', OPTION_MUSICONHOLD, OPTION_MUSICONHOLD_CLASS),
 	AST_APP_OPTION('1', OPTION_NOONLYPERSON),
-	AST_APP_OPTION('s', OPTION_STARTMUTED),
+	AST_APP_OPTION('s', OPTION_MENU),
 	AST_APP_OPTION('w', OPTION_WAITMARKED),
 	AST_APP_OPTION('q', OPTION_QUIET),
 });