Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch-contrib

mitchcapper/FSClient/Conference.cs

@@ -321,7 +321,7 @@ namespace FSClient {
 				menu.Items.Add(UserMenu(user));
 		}
 
-		private void EndConference() {
+		public void EndConference() {
 			ConferenceAction("kick all");
 		}
 

mitchcapper/FSClient/MainWindow.xaml

@@ -166,7 +166,7 @@
 				</Grid.RowDefinitions>
 				<TextBlock Grid.Row="0" Foreground="{DynamicResource GridTitleFGColor}" Text="Accounts" Margin="5,0,0,0" FontWeight="Bold" FontSize="13.333" Background="{DynamicResource GridTitleBGColor}" />
 				<Button x:Name="btnAccountAdd" Grid.Row="0" Content="Add" HorizontalAlignment="Right" Height="18" AutomationProperties.Name="Add New Account" TabIndex="80" Click="btnAccountAdd_Click" FontSize="11" />
-                <ItemsControl Name="itemsAccounts" Grid.Row="1" Background="{DynamicResource GridBodyBGColor}" Foreground="{DynamicResource RowFGColor}"  BorderBrush="{DynamicResource GridBorderColor}" AlternationCount="2" AutomationProperties.Name="Accounts List" TabIndex="100">
+                <ItemsControl Name="itemsAccounts" Grid.Row="1" Background="{DynamicResource GridBodyBGColor}" Foreground="{DynamicResource RowFGColor}"  BorderBrush="{DynamicResource GridBorderColor}" AlternationCount="2" AutomationProperties.Name="Accounts List" TabIndex="100" IsTabStop="False">
                     <ItemsControl.ContextMenu>
                         <ContextMenu> 
                             <MenuItem Header="Add Account" Click="AccountNew_Click" Name="menuAccountNew" />
@@ -184,7 +184,7 @@
                                     </ContextMenu>
                                 </StackPanel.ContextMenu>
                                 <TextBlock Text="{Binding gateway_id}" Width="10" Margin="2,2" />
-                                <CheckBox IsChecked="{Binding enabled, Mode=OneWay}"  Margin="2,2" Name="AccountCheckBox" Checked="AccountCheckBox_Checked" Unchecked="AccountCheckBox_Checked">
+                                <CheckBox IsChecked="{Binding enabled, Mode=TwoWay}"  Margin="2,2" Name="AccountCheckBox" Checked="AccountCheckBox_Checked" Unchecked="AccountCheckBox_Checked">
                                     <AutomationProperties.Name>
                                         <MultiBinding StringFormat="Account {0} State: {1}">
                                             <Binding Path="name" />

mitchcapper/FSClient/MainWindow.xaml.cs

@@ -615,8 +615,14 @@ namespace FSClient {
 		}
 
 		private void Window_Closing(object sender, CancelEventArgs e) {
-			try {
+			try{
 				Windows.systray_icon_remove();
+				Conference.instance.EndConference();
+				foreach (var call in Call.calls)
+					if (!call.call_ended)
+						call.hangup();
+			}catch{}
+			try{
 				broker.Dispose();
 			}
 			catch { }
@@ -902,7 +908,6 @@ namespace FSClient {
 			if (!broker.fully_loaded)
 				return;
 			Account account = ((FrameworkElement)e.OriginalSource).DataContext as Account;
-			account.enabled = !account.enabled;
 			account.ReloadAccount();
 		}
 	}

mitchcapper/FSClient/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.9")]
-[assembly: AssemblyFileVersion("1.2.0.9")]
+[assembly: AssemblyVersion("1.2.3.2")]
+[assembly: AssemblyFileVersion("1.2.3.2")]

mitchcapper/FSClient/Sofia.cs

@@ -172,8 +172,10 @@ namespace FSClient {
 				String tls_port_msg = "";
 				if (FieldValue.GetByName(values, "tls").value == "true")
 					tls_port_msg += " and tls bind port (" + FieldValue.GetByName(values, "tls-sip-port").value + ")";
-				MessageBox.Show("Warning the master sofia profile was not able to load and the phone will most likely _not_ work, make sure the local bind port (" + FieldValue.GetByName(values, "sip-port").value + ")" + tls_port_msg + " is free(set under the Advanced tab of in the sofia settings) and FSClient is allowed through your firewall, otherwise check the freeswitch.log for more details.  You can try reloading the sofia profile by editing the sofia settings and clicking save to see if fixed.");
+				var message_res = MessageBox.Show("Warning the master sofia profile was not able to load and the phone will most likely _not_ work, make sure the local bind port (" + FieldValue.GetByName(values, "sip-port").value + ")" + tls_port_msg + " is free(set under the Advanced tab of in the sofia settings) and FSClient is allowed through your firewall, otherwise check the freeswitch.log for more details. This can sometimes happen when you lose network connection. You can try reloading the sofia profile by editing the sofia settings and clicking save to see if fixed.   Do you want to try and reload sofia now?","Sofia Profile Not Loaded",MessageBoxButton.YesNo);
 				master_profile_ok = false;
+				if (message_res == MessageBoxResult.Yes)
+					reload_config(RELOAD_CONFIG_MODE.MODULE);
 				return false;
 			}
 			if (res.Contains("<context>public</context>") == false){

mod/applications/mod_translate/conf/translate.conf.xml

+<include>
+  <configuration name="translate.conf" description="Number Translation Rules">
+    <profiles>
+      <profile name="US">
+	<rule regex="^\+(\d+)$" replace="$1"/>
+	<rule regex="^(1[2-9]\d{2}[2-9]\d{6})$" replace="$1"/>
+	<rule regex="^([2-9]\d{2}[2-9]\d{6})$" replace="1$1"/>
+	<rule regex="^([2-9]\d{6})$" replace="1${areacode}$1"/>
+	<rule regex="^011(\d+)$" replace="$1"/>
+      </profile>
+      <profile name="GB">
+	<rule regex="^\+(\d+)$" replace="$1"/>
+	<rule regex="^$" replace="$1"/>
+      </profile>
+      <profile name="HK">
+	<rule regex="\+(\d+)$" replace="$1"/>
+	<rule regex="^(852\d{8})$" replace="$1"/>
+	<rule regex="^(\d{8})$" replace="852$1"/>
+      </profile>
+    </profiles>
+    <!--
+      <profile name="">
+	<rule regex="^\+(\d+)$" replace="$1"/>
+	<rule regex="^$" replace="$1"/>
+      </profile>
+    -->
+  </configuration>
+</include>

mod/applications/mod_translate/mod_translate/Makefile

+BASE=../../../..
+include $(BASE)/build/modmake.rules