[svn-commits] mattf: branch 1.6.0 r129400 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed Jul  9 11:01:49 2008
New Revision: 129400

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

........
r129399 | mattf | 2008-07-09 10:57:06 -0500 (Wed, 09 Jul 2008) | 1 line

Add Proceeding() application (#13025)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

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

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=129400&r1=129399&r2=129400
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Wed Jul  9 11:01:49 2008
@@ -304,6 +304,7 @@
 static int pbx_builtin_resetcdr(struct ast_channel *, void *);
 static int pbx_builtin_setamaflags(struct ast_channel *, void *);
 static int pbx_builtin_ringing(struct ast_channel *, void *);
+static int pbx_builtin_proceeding(struct ast_channel *, void *);
 static int pbx_builtin_progress(struct ast_channel *, void *);
 static int pbx_builtin_congestion(struct ast_channel *, void *);
 static int pbx_builtin_busy(struct ast_channel *, void *);
@@ -581,9 +582,15 @@
 	"purposes. Any text that is provided as arguments to this application can be\n"
 	"viewed at the Asterisk CLI. This method can be used to see the evaluations of\n"
 	"variables or functions without having any effect. Alternatively, see the\n"
-  "Verbose() application for finer grain control of output at custom verbose levels.\n"
+		"Verbose() application for finer grain control of output at custom verbose levels.\n"
 	},
-
+	
+	{ "Proceeding", pbx_builtin_proceeding,
+	"Indicate proceeding",
+	"  Proceeding(): This application will request that a proceeding message\n"
+	"be provided to the calling channel.\n"
+	},
+	
 	{ "Progress", pbx_builtin_progress,
 	"Indicate progress",
 	"  Progress(): This application will request that in-band progress information\n"
@@ -6974,6 +6981,15 @@
 /*!
  * \ingroup applications
  */
+static int pbx_builtin_proceeding(struct ast_channel *chan, void *data)
+{
+	ast_indicate(chan, AST_CONTROL_PROCEEDING);
+	return 0;
+}
+
+/*!
+ * \ingroup applications
+ */
 static int pbx_builtin_progress(struct ast_channel *chan, void *data)
 {
 	ast_indicate(chan, AST_CONTROL_PROGRESS);