[svn-commits] mnicholson: branch 1.6.2 r277338 - in /branches/1.6.2: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Fri Jul 16 13:33:05 2010
New Revision: 277338

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

................
  r277331 | mnicholson | 2010-07-16 13:31:08 -0500 (Fri, 16 Jul 2010) | 15 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/pbx.c

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

Modified: branches/1.6.2/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=277338&r1=277337&r2=277338
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Fri Jul 16 13:33:05 2010
@@ -3774,8 +3774,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: