<h1>Project "FreeSWITCH user-contributed scripts, etc" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 3fda7b4ada645ac361dac8e55ac7cafe94ae7287 (commit)
via: 0405d1fb7209050a0fa1cc0718c0aeee61191a95 (commit)
via: 7896938aefaf21adc42a01b4d8e9dd3d42ffbc82 (commit)
via: 9c0deb98bbc4aa6a9e5e6f792e911b550f4db83f (commit)
via: 0bff16bee499925e83339750a0ce5c1386fc0048 (commit)
via: 9858ca1c2a2fda5d56f268a6e359e207eedde6ab (commit)
from: 3d9d46652b597fd6360129de9c986491a58c5610 (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Raymond Chandler
comments:
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments:
change version of installer required
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/Product.wxs b/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #000080; font-weight: bold">index 073c9f0..0ab94b7 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #800080; font-weight: bold">@@ -13,7 +13,7 @@</span>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="f20f4348-01f9-457f-9112-60edb77761f4" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="7668faef-2ab3-4079-a986-07a33739b42e">
<span style="color: #A00000">- <Package InstallerVersion="200" Compressed="yes" /></span>
<span style="color: #00A000">+ <Package InstallerVersion="300" Compressed="yes" /></span>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Make accounts default to 0 last rather than after 1, add a proper remove account function and kill it out of sofia first, don't add a new account if a user clicks cancel.
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Account.cs b/mitchcapper/FSClient/Account.cs</span>
<span style="color: #000080; font-weight: bold">index d987ced..59f0197 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Account.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Account.cs</span>
<span style="color: #800080; font-weight: bold">@@ -125,7 +125,11 @@ namespace FSClient {</span>
account.guid = "";
account.guid = old_guid;
}
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ public static void RemoveAccount(Account account){</span>
<span style="color: #00A000">+ account.KillGateway();</span>
<span style="color: #00A000">+ accounts.Remove(account);</span>
<span style="color: #00A000">+ ReloadSofia();</span>
<span style="color: #00A000">+ }</span>
public static void create_gateway_nodes(XmlNode gateways_node) {
foreach (Account account in accounts) {
<span style="color: #800080; font-weight: bold">@@ -170,9 +174,10 @@ namespace FSClient {</span>
_guid.PropertyChanged += (s, e) => {
if (!guid_ok(this, _guid.value) || String.IsNullOrEmpty(_guid.value)) {
<span style="color: #A00000">- for (int i = 0; i < 10; i++) {</span>
<span style="color: #A00000">- if (guid_ok(this, i.ToString())) {</span>
<span style="color: #A00000">- _guid.value = i.ToString();</span>
<span style="color: #00A000">+ for (int i = 1; i <= 10; i++){</span>
<span style="color: #00A000">+ int val = i == 10 ? 0 : i; // want 0 checked last.</span>
<span style="color: #00A000">+ if (guid_ok(this, val.ToString())) {</span>
<span style="color: #00A000">+ _guid.value = val.ToString();</span>
return;
}
}
<span style="color: #800080; font-weight: bold">@@ -329,13 +334,16 @@ namespace FSClient {</span>
KillGateway();
ReloadSofia();
}
<span style="color: #A00000">- public void edit() {</span>
<span style="color: #00A000">+ public bool edit() {</span>
current_editing_account = this;
GenericEditor editor = new GenericEditor();
editor.Init("Editing Account", values);
editor.ShowDialog();
if (editor.DialogResult == true)
ReloadAccount();
<span style="color: #00A000">+ else</span>
<span style="color: #00A000">+ return false;</span>
<span style="color: #00A000">+ return true;</span>
}
}
}
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #000080; font-weight: bold">index b774695..58d6d91 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #800080; font-weight: bold">@@ -228,7 +228,7 @@ namespace FSClient {</span>
}
public void DialString(String str){
if (string.IsNullOrWhiteSpace(str))
<span style="color: #A00000">- return;</span>
<span style="color: #00A000">+ return;</span>
MainWindowRemoveFocus(true);
if (str.StartsWith("#") && str.Length > 2) {
<span style="color: #800080; font-weight: bold">@@ -572,8 +572,8 @@ namespace FSClient {</span>
public OurAutoCompleteBox GetContactSearchBox() {
return MainWindow.get_instance().GetContactSearchBox();
}
<span style="color: #A00000">- public void MainWindowRemoveFocus(bool ResetContactSearchText=false){</span>
<span style="color: #A00000">- MainWindow.get_instance().RemoveFocus(ResetContactSearchText);</span>
<span style="color: #00A000">+ public void MainWindowRemoveFocus(bool ResetContactSearchText=false){</span>
<span style="color: #00A000">+ MainWindow.get_instance().RemoveFocus(ResetContactSearchText);</span>
}
private delegate void BroadcastEventDel(FSEvent evt);
BroadcastEventDel BroadcastHandler;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/MainWindow.xaml.cs b/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #000080; font-weight: bold">index 2201cf0..1ea68a4 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/MainWindow.xaml.cs</span>
<span style="color: #800080; font-weight: bold">@@ -365,7 +365,8 @@ namespace FSClient {</span>
private void AccountNew_Click(object sender, RoutedEventArgs e) {
Account acct = new Account();
Account.AddAccount(acct);
<span style="color: #A00000">- acct.edit();</span>
<span style="color: #00A000">+ if (!acct.edit())</span>
<span style="color: #00A000">+ Account.RemoveAccount(acct);</span>
}
<span style="color: #800080; font-weight: bold">@@ -387,7 +388,7 @@ namespace FSClient {</span>
Account acct = gridAccounts.SelectedItem as Account;
if (acct == null)
return;
<span style="color: #A00000">- Account.accounts.Remove(acct);</span>
<span style="color: #00A000">+ Account.RemoveAccount(acct);</span>
}
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments:
I cannot spell the word balloons.
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #000080; font-weight: bold">index 0195525..b774695 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Broker.cs</span>
<span style="color: #800080; font-weight: bold">@@ -46,7 +46,7 @@ namespace FSClient {</span>
Account.LoadSettings();
<span style="color: #A00000">- IncomingBallons = Properties.Settings.Default.IncomingBallons;</span>
<span style="color: #00A000">+ IncomingBalloons = Properties.Settings.Default.IncomingBalloons;</span>
IncomingTopMost = Properties.Settings.Default.FrontOnIncoming;
ClearDTMFS = Properties.Settings.Default.ClearDTMFS;
UseNumberOnlyInput = Properties.Settings.Default.UseNumberOnlyInput;
<span style="color: #800080; font-weight: bold">@@ -306,7 +306,7 @@ namespace FSClient {</span>
try {
SaveAudioSettings();
Account.SaveSettings();
<span style="color: #A00000">- Properties.Settings.Default.IncomingBallons = IncomingBallons;</span>
<span style="color: #00A000">+ Properties.Settings.Default.IncomingBalloons = IncomingBalloons;</span>
Properties.Settings.Default.FrontOnIncoming = IncomingTopMost;
Properties.Settings.Default.ClearDTMFS = ClearDTMFS;
Properties.Settings.Default.UseNumberOnlyInput = UseNumberOnlyInput;
<span style="color: #800080; font-weight: bold">@@ -389,7 +389,7 @@ namespace FSClient {</span>
if (IncomingTopMost) {
MainWindow.get_instance().BringToFront();
}
<span style="color: #A00000">- if (IncomingBallons && !DND) {</span>
<span style="color: #00A000">+ if (IncomingBalloons && !DND) {</span>
IncomingCallNotification.ShowCallNotification(args.call);
if (Call.active_call != args.call && Call.active_call != null)
HandleCallWaiting(null, args.call);
<span style="color: #800080; font-weight: bold">@@ -404,7 +404,7 @@ namespace FSClient {</span>
}
#region properties
<span style="color: #A00000">- public bool IncomingBallons;</span>
<span style="color: #00A000">+ public bool IncomingBalloons;</span>
public bool IncomingTopMost;
public bool UseNumberOnlyInput {
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Options.xaml b/mitchcapper/FSClient/Options.xaml</span>
<span style="color: #000080; font-weight: bold">index 992af17..7fc4ba9 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Options.xaml</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Options.xaml</span>
<span style="color: #800080; font-weight: bold">@@ -45,7 +45,7 @@</span>
<ComboBox Height="23" Grid.Row="6" Grid.Column="1" Name="comboRingDevice" Width="340" />
<StackPanel Grid.Row="7" Grid.Column="1" Grid.RowSpan="3">
<CheckBox x:Name="chkIncomingFront" Content="Bring To Front On Incoming Calls" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<span style="color: #A00000">- <CheckBox x:Name="chkIncomingBallons" Content="Show Incoming Call Notification Ballons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" /></span>
<span style="color: #00A000">+ <CheckBox x:Name="chkIncomingBalloons" Content="Show Incoming Call Notification Balloons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" /></span>
<CheckBox x:Name="chkClearDTMFS" Content="Clear Key Presses In Call Stats On Disconnect" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<CheckBox x:Name="chkUseNumbers" Content="Only Allow Numerical Input While Dialing" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
</StackPanel>
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Options.xaml.cs b/mitchcapper/FSClient/Options.xaml.cs</span>
<span style="color: #000080; font-weight: bold">index 11fcd70..fb7c1f3 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Options.xaml.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Options.xaml.cs</span>
<span style="color: #800080; font-weight: bold">@@ -31,7 +31,7 @@ namespace FSClient {</span>
comboSpeakerInput.SelectedItem = broker.SpeakerInDev;
comboSpeakerOutput.SelectedItem = broker.SpeakerOutDev;
comboRingDevice.SelectedItem = broker.RingDev;
<span style="color: #A00000">- chkIncomingBallons.IsChecked = broker.IncomingBallons;</span>
<span style="color: #00A000">+ chkIncomingBalloons.IsChecked = broker.IncomingBalloons;</span>
chkIncomingFront.IsChecked = broker.IncomingTopMost;
chkClearDTMFS.IsChecked = broker.ClearDTMFS;
chkUseNumbers.IsChecked = broker.UseNumberOnlyInput;
<span style="color: #800080; font-weight: bold">@@ -51,7 +51,7 @@ namespace FSClient {</span>
broker.SetSpeakerDevs(indev == null ? "" : indev.name, outdev == null ? "" : outdev.name);
outdev = comboRingDevice.SelectedItem as PortAudio.AudioDevice;
broker.SetRingDev(outdev == null ? "" : outdev.name);
<span style="color: #A00000">- broker.IncomingBallons = chkIncomingBallons.IsChecked == true;</span>
<span style="color: #00A000">+ broker.IncomingBalloons = chkIncomingBalloons.IsChecked == true;</span>
broker.IncomingTopMost = chkIncomingFront.IsChecked == true;
broker.ClearDTMFS = chkClearDTMFS.IsChecked == true;
broker.UseNumberOnlyInput = chkUseNumbers.IsChecked == true;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Properties/Settings.Designer.cs b/mitchcapper/FSClient/Properties/Settings.Designer.cs</span>
<span style="color: #000080; font-weight: bold">index fa47b05..84e25f5 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Properties/Settings.Designer.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Properties/Settings.Designer.cs</span>
<span style="color: #800080; font-weight: bold">@@ -120,12 +120,12 @@ namespace FSClient.Properties {</span>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
<span style="color: #A00000">- public bool IncomingBallons {</span>
<span style="color: #00A000">+ public bool IncomingBalloons {</span>
get {
<span style="color: #A00000">- return ((bool)(this["IncomingBallons"]));</span>
<span style="color: #00A000">+ return ((bool)(this["IncomingBalloons"]));</span>
}
set {
<span style="color: #A00000">- this["IncomingBallons"] = value;</span>
<span style="color: #00A000">+ this["IncomingBalloons"] = value;</span>
}
}
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Properties/Settings.settings b/mitchcapper/FSClient/Properties/Settings.settings</span>
<span style="color: #000080; font-weight: bold">index e74d6ce..74ba8e9 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Properties/Settings.settings</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Properties/Settings.settings</span>
<span style="color: #800080; font-weight: bold">@@ -26,7 +26,7 @@</span>
<Setting Name="FrontOnIncoming" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<span style="color: #A00000">- <Setting Name="IncomingBallons" Type="System.Boolean" Scope="User"></span>
<span style="color: #00A000">+ <Setting Name="IncomingBalloons" Type="System.Boolean" Scope="User"></span>
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="HeadsetDevice" Type="System.String" Scope="User">
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #000080; font-weight: bold">index 4575f30..3c1b33b 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #800080; font-weight: bold">@@ -127,8 +127,8 @@ namespace FSClient</span>
}
protected void refresh_search_box(){
if (search_box == null)
<span style="color: #A00000">- return;</span>
<span style="color: #A00000">- search_box.ItemsSource = from c in number_to_alias select new SearchAutoCompleteEntry(c.Key,c.Value);</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+ search_box.ItemsSource = from c in number_to_alias orderby c.Value,c.Key select new SearchAutoCompleteEntry(c.Key, c.Value);</span>
}
protected class SearchAutoCompleteEntry{
public string number;
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/app.config b/mitchcapper/FSClient/app.config</span>
<span style="color: #000080; font-weight: bold">index 27ee233..292f672 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/app.config</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/app.config</span>
<span style="color: #800080; font-weight: bold">@@ -25,7 +25,7 @@</span>
<setting name="FrontOnIncoming" serializeAs="String">
<value>True</value>
</setting>
<span style="color: #A00000">- <setting name="IncomingBallons" serializeAs="String"></span>
<span style="color: #00A000">+ <setting name="IncomingBalloons" serializeAs="String"></span>
<value>True</value>
</setting>
<setting name="HeadsetDevice" serializeAs="String">
</pre></div>
========================================================================<pre>
Summary of changes:
mitchcapper/FSClient/Account.cs | 28 +++++++++++------
mitchcapper/FSClient/Broker.cs | 14 ++++----
mitchcapper/FSClient/DelayedFunction.cs | 10 ++++--
mitchcapper/FSClient/GenericEditor.xaml.cs | 9 ++---
mitchcapper/FSClient/MainWindow.xaml.cs | 5 ++-
mitchcapper/FSClient/Options.xaml | 2 +-
mitchcapper/FSClient/Options.xaml.cs | 4 +-
.../FSClient/Properties/Settings.Designer.cs | 6 ++--
mitchcapper/FSClient/Properties/Settings.settings | 2 +-
mitchcapper/FSClient/README.txt | 32 +-------------------
mitchcapper/FSClient/Setup/Product.wxs | 2 +-
mitchcapper/FSClient/SimpleContactPluginBase.cs | 4 +-
mitchcapper/FSClient/TODO.txt | 2 -
mitchcapper/FSClient/Windows.cs | 7 ++--
mitchcapper/FSClient/app.config | 2 +-
15 files changed, 54 insertions(+), 75 deletions(-)
delete mode 100644 mitchcapper/FSClient/TODO.txt
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH user-contributed scripts, etc</p>