[asterisk-commits] mnicholson: trunk r277331 - in /trunk: ./ main/pbx.c

Fri Jul 16 13:31:14 CDT 2010

Author: mnicholson
Date: Fri Jul 16 13:31:08 2010
New Revision: 277331

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277331
Log:
Merged revisions 277327 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r277327 | mnicholson | 2010-07-16 13:30:22 -0500 (Fri, 16 Jul 2010) | 8 lines
  
  Interpret device state AST_DEVICE_UNKNOWN as extension state AST_EXTENSION_NOT_INUSE.
  
  (closes issue #16035)
  Reported by: francesco_r
  Patches:
        pbx.c.patch uploaded by viniciusfontes (license 978)
  Tested by: francesco_r, agx, lawbar
........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

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

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=277331&r1=277330&r2=277331
==============================================================================

--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri Jul 16 13:31:08 2010
@@ -4133,8 +4133,9 @@
 		return AST_EXTENSION_ONHOLD;
 	case AST_DEVICE_BUSY:
 		return AST_EXTENSION_BUSY;
+	case AST_DEVICE_UNKNOWN:
+		return AST_EXTENSION_NOT_INUSE;
 	case AST_DEVICE_UNAVAILABLE:
-	case AST_DEVICE_UNKNOWN:
 	case AST_DEVICE_INVALID:
 		return AST_EXTENSION_UNAVAILABLE;
 	case AST_DEVICE_RINGINUSE:


