<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16881">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: disappear<br><br>Change-Id: I7654d4db64e4f56863e02b78e63269bc8abc0e10<br>---<br>M channels/sig_analog.c<br>M main/channel.c<br>M main/core_local.c<br>3 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/81/16881/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/sig_analog.c b/channels/sig_analog.c</span><br><span>index 5bb5649..211a680 100644</span><br><span>--- a/channels/sig_analog.c</span><br><span>+++ b/channels/sig_analog.c</span><br><span>@@ -1314,7 +1314,7 @@</span><br><span> /* Need to hold the lock for real-call, private, and call-waiting call */</span><br><span> analog_lock_sub_owner(p, ANALOG_SUB_CALLWAIT);</span><br><span> if (!p->subs[ANALOG_SUB_CALLWAIT].owner) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* The call waiting call dissappeared. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The call waiting call disappeared. */</span><br><span> analog_set_new_owner(p, NULL);</span><br><span> break;</span><br><span> }</span><br><span>@@ -2905,7 +2905,7 @@</span><br><span> analog_lock_sub_owner(p, ANALOG_SUB_CALLWAIT);</span><br><span> if (!p->subs[ANALOG_SUB_CALLWAIT].owner) {</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * The call waiting call dissappeared.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The call waiting call disappeared.</span><br><span> * This is now a normal hangup.</span><br><span> */</span><br><span> analog_set_echocanceller(p, 0);</span><br><span>@@ -3223,7 +3223,7 @@</span><br><span> analog_lock_sub_owner(p, ANALOG_SUB_CALLWAIT);</span><br><span> if (!p->subs[ANALOG_SUB_CALLWAIT].owner) {</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * The call waiting call dissappeared.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The call waiting call disappeared.</span><br><span> * Let's just ignore this flash-hook.</span><br><span> */</span><br><span> ast_log(LOG_NOTICE, "Whoa, the call-waiting call disappeared.\n");</span><br><span>@@ -3350,7 +3350,7 @@</span><br><span> analog_lock_sub_owner(p, ANALOG_SUB_THREEWAY);</span><br><span> if (!p->subs[ANALOG_SUB_THREEWAY].owner) {</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * The 3-way call dissappeared.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The 3-way call disappeared.</span><br><span> * Let's just ignore this flash-hook.</span><br><span> */</span><br><span> ast_log(LOG_NOTICE, "Whoa, the 3-way call disappeared.\n");</span><br><span>diff --git a/main/channel.c b/main/channel.c</span><br><span>index 3d7eeba..fc814b4 100644</span><br><span>--- a/main/channel.c</span><br><span>+++ b/main/channel.c</span><br><span>@@ -6919,7 +6919,7 @@</span><br><span> */</span><br><span> ao2_lock(channels);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Bump the refs to ensure that they won't dissappear on us. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Bump the refs to ensure that they won't disappear on us. */</span><br><span> ast_channel_ref(original);</span><br><span> ast_channel_ref(clonechan);</span><br><span> </span><br><span>diff --git a/main/core_local.c b/main/core_local.c</span><br><span>index baa3e1f..43b03eb 100644</span><br><span>--- a/main/core_local.c</span><br><span>+++ b/main/core_local.c</span><br><span>@@ -883,7 +883,7 @@</span><br><span> *</span><br><span> * This is a silly default because it represents state held by</span><br><span> * the local channels. Unless local channel optimization is</span><br><span style="color: hsl(0, 100%, 40%);">- * disabled, the state will dissappear when the local channels</span><br><span style="color: hsl(120, 100%, 40%);">+ * disabled, the state will disappear when the local channels</span><br><span> * optimize out.</span><br><span> */</span><br><span> ast_set_flag(&pvt->base, AST_UNREAL_MOH_INTERCEPT);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16881">change 16881</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/c/asterisk/+/16881"/><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-Change-Id: I7654d4db64e4f56863e02b78e63269bc8abc0e10 </div>
<div style="display:none"> Gerrit-Change-Number: 16881 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>