[svn-commits] tilghman: branch 1.6.1 r225362 - in /branches/1.6.1: ./ apps/ include/asteris...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Oct 22 12:14:39 2009
New Revision: 225362

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

................
  r225360 | tilghman | 2009-10-22 12:11:23 -0500 (Thu, 22 Oct 2009) | 11 lines
  
  Merged revisions 225105 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r225105 | tilghman | 2009-10-21 11:02:12 -0500 (Wed, 21 Oct 2009) | 4 lines
    
    Fix documentation for ast_softhangup() and correct the misuse thereof.
    (closes issue #16103)
     Reported by: majorbloodnok
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_meetme.c
    branches/1.6.1/include/asterisk/channel.h
    branches/1.6.1/main/pbx.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=225362&r1=225361&r2=225362
==============================================================================
--- branches/1.6.1/apps/app_meetme.c (original)
+++ branches/1.6.1/apps/app_meetme.c Thu Oct 22 12:14:39 2009
@@ -4595,7 +4595,7 @@
 		ast_indicate(event->trunk_ref->trunk->chan, AST_CONTROL_HOLD);
 	}
 
-	ast_softhangup(event->trunk_ref->chan, AST_CAUSE_NORMAL);
+	ast_softhangup(event->trunk_ref->chan, AST_SOFTHANGUP_DEV);
 	event->trunk_ref->chan = NULL;
 }
 

Modified: branches/1.6.1/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/include/asterisk/channel.h?view=diff&rev=225362&r1=225361&r2=225362
==============================================================================
--- branches/1.6.1/include/asterisk/channel.h (original)
+++ branches/1.6.1/include/asterisk/channel.h Thu Oct 22 12:14:39 2009
@@ -944,7 +944,7 @@
  * \brief Softly hangup up a channel
  *
  * \param chan channel to be soft-hung-up
- * \param cause	Ast hangupcause for hangup
+ * \param reason an AST_SOFTHANGUP_* reason code
  *
  * Call the protocol layer, but don't destroy the channel structure
  * (use this if you are trying to
@@ -954,12 +954,13 @@
  *
  * \return Returns 0 regardless
  */
-int ast_softhangup(struct ast_channel *chan, int cause);
+int ast_softhangup(struct ast_channel *chan, int reason);
 
 /*! \brief Softly hangup up a channel (no channel lock)
  * \param chan channel to be soft-hung-up
- * \param cause	Ast hangupcause for hangup (see cause.h) */
-int ast_softhangup_nolock(struct ast_channel *chan, int cause);
+ * \param reason an AST_SOFTHANGUP_* reason code
+ */
+int ast_softhangup_nolock(struct ast_channel *chan, int reason);
 
 /*! \brief Check to see if a channel is needing hang up
  * \param chan channel on which to check for hang up

Modified: branches/1.6.1/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=225362&r1=225361&r2=225362
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Thu Oct 22 12:14:39 2009
@@ -3912,7 +3912,7 @@
 	}
 
 	if (!args || !args->no_hangup_chan) {
-		ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING);
+		ast_softhangup(c, AST_SOFTHANGUP_APPUNLOAD);
 	}
 
 	if ((!args || !args->no_hangup_chan) &&