[asterisk-commits] rmudgett: branch 1.6.1 r259309 - in /branches/1.6.1: ./ channels/ configs/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Apr 27 13:53:17 2010
New Revision: 259309

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

................
  r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines
  
  Merged revisions 259270 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines
    
    hidecalleridname parameter in chan_dahdi.conf
    
    Issue #7321 implements a new chan_dahdi configuration option.  However, a
    change mentioned in the issue was never implemented.  This is the change
    that will allow the feature to work.
    
    I added a note to chan_dahdi.conf.sample about the feature.
    
    (closes issue #17143)
    Reported by: djensen99
    Patches:
          diff.txt uploaded by djensen99 (license NA) (One line change)
    Tested by: djensen99
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c
    branches/1.6.1/configs/chan_dahdi.conf.sample

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

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=259309&r1=259308&r2=259309
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Tue Apr 27 13:53:17 2010
@@ -9126,6 +9126,7 @@
 		tmp->adsi = conf->chan.adsi;
 		tmp->use_smdi = conf->chan.use_smdi;
 		tmp->permhidecallerid = conf->chan.hidecallerid;
+		tmp->hidecalleridname = conf->chan.hidecalleridname;
 		tmp->callreturn = conf->chan.callreturn;
 		tmp->echocancel = conf->chan.echocancel;
 		tmp->echotraining = conf->chan.echotraining;

Modified: branches/1.6.1/configs/chan_dahdi.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/chan_dahdi.conf.sample?view=diff&rev=259309&r1=259308&r2=259309
==============================================================================
--- branches/1.6.1/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.1/configs/chan_dahdi.conf.sample Tue Apr 27 13:53:17 2010
@@ -330,10 +330,6 @@
 ;
 usecallerid=yes
 ;
-; Hide the name part and leave just the number part of the caller ID
-; string. Only applies to PRI channels.
-;hidecalleridname=yes
-;
 ; Type of caller ID signalling in use
 ;     bell     = bell202 as used in US (default)
 ;     v23      = v23 as used in the UK
@@ -356,6 +352,10 @@
 ; (If your dialplan doesn't catch it)
 ;
 ;hidecallerid=yes
+;
+; Enable if you need to hide just the name and not the number for legacy PBX use.
+; Only applies to PRI channels.
+;hidecalleridname=yes
 ;
 ; The following option enables receiving MWI on FXO lines.  The default
 ; value is no.