discards 98ea43c3681dd0263dcf027aef3437732e0682e1 (commit)
discards 9aa2f07c369938230c5c4b8b61b67b1c53749efe (commit)
discards cfaca250a7c49387abd98ef3fbd7124efb02d422 (commit)
discards b6c998685330b7c689cd08726438271ac68f0361 (commit)
discards 75bbd885eb1eef0bcfea9b5371557823ca584522 (commit)
via: 9858ca1c2a2fda5d56f268a6e359e207eedde6ab (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (98ea43c3681dd0263dcf027aef3437732e0682e1)
\
N -- N -- N (9858ca1c2a2fda5d56f268a6e359e207eedde6ab)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
= COMMIT LOG ===========================================================
committer: Mitch Capper
comments:
I cannot spell the word balloons.
diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs
index 0195525..b774695 100644
--- a/mitchcapper/FSClient/Broker.cs
+++ b/mitchcapper/FSClient/Broker.cs
@@ -46,7 +46,7 @@ namespace FSClient {
Account.LoadSettings();
- IncomingBallons = Properties.Settings.Default.IncomingBallons;
+ IncomingBalloons = Properties.Settings.Default.IncomingBalloons;
IncomingTopMost = Properties.Settings.Default.FrontOnIncoming;
ClearDTMFS = Properties.Settings.Default.ClearDTMFS;
UseNumberOnlyInput = Properties.Settings.Default.UseNumberOnlyInput;
@@ -306,7 +306,7 @@ namespace FSClient {
try {
SaveAudioSettings();
Account.SaveSettings();
- Properties.Settings.Default.IncomingBallons = IncomingBallons;
+ Properties.Settings.Default.IncomingBalloons = IncomingBalloons;
Properties.Settings.Default.FrontOnIncoming = IncomingTopMost;
Properties.Settings.Default.ClearDTMFS = ClearDTMFS;
Properties.Settings.Default.UseNumberOnlyInput = UseNumberOnlyInput;
@@ -389,7 +389,7 @@ namespace FSClient {
if (IncomingTopMost) {
MainWindow.get_instance().BringToFront();
}
- if (IncomingBallons && !DND) {
+ if (IncomingBalloons && !DND) {
IncomingCallNotification.ShowCallNotification(args.call);
if (Call.active_call != args.call && Call.active_call != null)
HandleCallWaiting(null, args.call);
@@ -404,7 +404,7 @@ namespace FSClient {
}
#region properties
- public bool IncomingBallons;
+ public bool IncomingBalloons;
public bool IncomingTopMost;
public bool UseNumberOnlyInput {
diff --git a/mitchcapper/FSClient/Options.xaml b/mitchcapper/FSClient/Options.xaml
index 992af17..7fc4ba9 100644
--- a/mitchcapper/FSClient/Options.xaml
+++ b/mitchcapper/FSClient/Options.xaml
@@ -45,7 +45,7 @@
<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" />
- <CheckBox x:Name="chkIncomingBallons" Content="Show Incoming Call Notification Ballons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
+ <CheckBox x:Name="chkIncomingBalloons" Content="Show Incoming Call Notification Balloons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<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>
diff --git a/mitchcapper/FSClient/Options.xaml.cs b/mitchcapper/FSClient/Options.xaml.cs
index 11fcd70..fb7c1f3 100644
--- a/mitchcapper/FSClient/Options.xaml.cs
+++ b/mitchcapper/FSClient/Options.xaml.cs
@@ -31,7 +31,7 @@ namespace FSClient {
comboSpeakerInput.SelectedItem = broker.SpeakerInDev;
comboSpeakerOutput.SelectedItem = broker.SpeakerOutDev;
comboRingDevice.SelectedItem = broker.RingDev;
- chkIncomingBallons.IsChecked = broker.IncomingBallons;
+ chkIncomingBalloons.IsChecked = broker.IncomingBalloons;
chkIncomingFront.IsChecked = broker.IncomingTopMost;
chkClearDTMFS.IsChecked = broker.ClearDTMFS;
chkUseNumbers.IsChecked = broker.UseNumberOnlyInput;
@@ -51,7 +51,7 @@ namespace FSClient {
broker.SetSpeakerDevs(indev == null ? "" : indev.name, outdev == null ? "" : outdev.name);
outdev = comboRingDevice.SelectedItem as PortAudio.AudioDevice;
broker.SetRingDev(outdev == null ? "" : outdev.name);
- broker.IncomingBallons = chkIncomingBallons.IsChecked == true;
+ broker.IncomingBalloons = chkIncomingBalloons.IsChecked == true;
broker.IncomingTopMost = chkIncomingFront.IsChecked == true;
broker.ClearDTMFS = chkClearDTMFS.IsChecked == true;
broker.UseNumberOnlyInput = chkUseNumbers.IsChecked == true;
diff --git a/mitchcapper/FSClient/Properties/Settings.Designer.cs b/mitchcapper/FSClient/Properties/Settings.Designer.cs
index fa47b05..84e25f5 100644
--- a/mitchcapper/FSClient/Properties/Settings.Designer.cs
+++ b/mitchcapper/FSClient/Properties/Settings.Designer.cs
@@ -120,12 +120,12 @@ namespace FSClient.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
- public bool IncomingBallons {
+ public bool IncomingBalloons {
get {
- return ((bool)(this["IncomingBallons"]));
+ return ((bool)(this["IncomingBalloons"]));
}
set {
- this["IncomingBallons"] = value;
+ this["IncomingBalloons"] = value;
}
}
diff --git a/mitchcapper/FSClient/Properties/Settings.settings b/mitchcapper/FSClient/Properties/Settings.settings
index e74d6ce..74ba8e9 100644
--- a/mitchcapper/FSClient/Properties/Settings.settings
+++ b/mitchcapper/FSClient/Properties/Settings.settings
@@ -26,7 +26,7 @@
<Setting Name="FrontOnIncoming" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
- <Setting Name="IncomingBallons" Type="System.Boolean" Scope="User">
+ <Setting Name="IncomingBalloons" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="HeadsetDevice" Type="System.String" Scope="User">
diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs
index 4575f30..3c1b33b 100644
--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs
+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs
@@ -127,8 +127,8 @@ namespace FSClient
}
protected void refresh_search_box(){
if (search_box == null)
- return;
- search_box.ItemsSource = from c in number_to_alias select new SearchAutoCompleteEntry(c.Key,c.Value);
+ return;
+ search_box.ItemsSource = from c in number_to_alias orderby c.Value,c.Key select new SearchAutoCompleteEntry(c.Key, c.Value);
}
protected class SearchAutoCompleteEntry{
public string number;
diff --git a/mitchcapper/FSClient/app.config b/mitchcapper/FSClient/app.config
index 27ee233..292f672 100644
--- a/mitchcapper/FSClient/app.config
+++ b/mitchcapper/FSClient/app.config
@@ -25,7 +25,7 @@
<setting name="FrontOnIncoming" serializeAs="String">
<value>True</value>
</setting>
- <setting name="IncomingBallons" serializeAs="String">
+ <setting name="IncomingBalloons" serializeAs="String">
<value>True</value>
</setting>
<setting name="HeadsetDevice" serializeAs="String">
Summary of changes: intralanman/PHP/fs_curl/README | 4 ++-- mitchcapper/FSClient/Broker.cs | 8 ++++---- mitchcapper/FSClient/FSClient.csproj | 2 +- 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/Setup/FSCore.wxs | 2 +- mitchcapper/FSClient/Setup/Setup.wixproj | 4 ---- mitchcapper/FSClient/SimpleContactPluginBase.cs | 4 ++-- mitchcapper/FSClient/app.config | 2 +- 11 files changed, 18 insertions(+), 22 deletions(-)
this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630
--
FreeSWITCH user-contributed scripts, etc