<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/10512">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_parking: Stop setting the deprecated PARKINGSLOT channel variable.<br><br>Change-Id: Ia155ce2a53d61556aa4685524d1b48cfacfa3a8b<br>---<br>M UPGRADE.txt<br>M configs/samples/res_parking.conf.sample<br>M res/parking/parking_bridge_features.c<br>M res/res_parking.c<br>4 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/12/10512/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/UPGRADE.txt b/UPGRADE.txt</span><br><span>index b7bbf3b..bacff03 100644</span><br><span>--- a/UPGRADE.txt</span><br><span>+++ b/UPGRADE.txt</span><br><span>@@ -25,3 +25,7 @@</span><br><span> === UPGRADE-16.txt  -- Upgrade info for 15 to 16</span><br><span> ===========================================================</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+From 16 to 17:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+* The PARKINGSLOT channel variable, deprecated in Asterisk 12 in favor of the</span><br><span style="color: hsl(120, 100%, 40%);">+  PARKING_SPACE channel variable, will no longer be set.</span><br><span>diff --git a/configs/samples/res_parking.conf.sample b/configs/samples/res_parking.conf.sample</span><br><span>index e13f780..2e0beba 100644</span><br><span>--- a/configs/samples/res_parking.conf.sample</span><br><span>+++ b/configs/samples/res_parking.conf.sample</span><br><span>@@ -102,7 +102,7 @@</span><br><span>                                 ;         Dial() to 'SIP/0004F2040001'.</span><br><span>                                 ;</span><br><span>                                 ; During the timeout procedure, the following variables are set</span><br><span style="color: hsl(0, 100%, 40%);">-                                ; PARKINGSLOT - extension that the call was parked in prior to timing out</span><br><span style="color: hsl(120, 100%, 40%);">+                                ; PARKING_SPACE - extension that the call was parked in prior to timing out</span><br><span>                                 ; PARKEDLOT - name of the lot that the call was parked in prior to timing out</span><br><span>                                 ; PARKER - dial string to call the device that parked the call</span><br><span> </span><br><span>diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c</span><br><span>index cbc23fa..f73f371 100644</span><br><span>--- a/res/parking/parking_bridge_features.c</span><br><span>+++ b/res/parking/parking_bridge_features.c</span><br><span>@@ -603,7 +603,6 @@</span><br><span>       ast_channel_lock(chan);</span><br><span>      ast_channel_stage_snapshot(chan);</span><br><span>    pbx_builtin_setvar_helper(chan, "PARKING_SPACE", parking_space);</span><br><span style="color: hsl(0, 100%, 40%);">-      pbx_builtin_setvar_helper(chan, "PARKINGSLOT", parking_space); /* Deprecated version of PARKING_SPACE */</span><br><span>   pbx_builtin_setvar_helper(chan, "PARKEDLOT", user->lot->name);</span><br><span>       pbx_builtin_setvar_helper(chan, "PARKER", dial_string);</span><br><span>    pbx_builtin_setvar_helper(chan, "PARKER_FLAT", dial_string_flat);</span><br><span>diff --git a/res/res_parking.c b/res/res_parking.c</span><br><span>index 5d1b30c..fa76c48 100644</span><br><span>--- a/res/res_parking.c</span><br><span>+++ b/res/res_parking.c</span><br><span>@@ -149,9 +149,6 @@</span><br><span>                                                   <variable name="PARKING_SPACE"></span><br><span>                                                              <para>extension that the call was parked in prior to timing out.</para></span><br><span>                                                  </variable></span><br><span style="color: hsl(0, 100%, 40%);">-                                                       <variable name="PARKINGSLOT"></span><br><span style="color: hsl(0, 100%, 40%);">-                                                           <para>Deprecated.  Use <variable>PARKING_SPACE</variable> instead.</para></span><br><span style="color: hsl(0, 100%, 40%);">-                                                       </variable></span><br><span>                                                    <variable name="PARKEDLOT"></span><br><span>                                                          <para>name of the lot that the call was parked in prior to timing out.</para></span><br><span>                                                    </variable></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10512">change 10512</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10512"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia155ce2a53d61556aa4685524d1b48cfacfa3a8b </div>
<div style="display:none"> Gerrit-Change-Number: 10512 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>