[svn-commits] russell: branch 1.6.0 r108798 - in /branches/1.6.0: ./ channels/chan_oss.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Mar 14 15:09:53 2008
New Revision: 108798

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

................
r108797 | russell | 2008-03-14 15:09:37 -0500 (Fri, 14 Mar 2008) | 13 lines

Merged revisions 108796 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108796 | russell | 2008-03-14 15:09:22 -0500 (Fri, 14 Mar 2008) | 5 lines

Fix a channel name issue.  chan_oss registers the "Console" channel type,
but it created channels with an "OSS" prefix.

(closes issue #12194, reported by davidw, patched by me)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_oss.c

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

Modified: branches/1.6.0/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_oss.c?view=diff&rev=108798&r1=108797&r2=108798
==============================================================================
--- branches/1.6.0/channels/chan_oss.c (original)
+++ branches/1.6.0/channels/chan_oss.c Fri Mar 14 15:09:53 2008
@@ -789,7 +789,7 @@
 {
 	struct ast_channel *c;
 
-	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "OSS/%s", o->device + 5);
+	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "Console/%s", o->device + 5);
 	if (c == NULL)
 		return NULL;
 	c->tech = &oss_tech;