- Freeswitch-trunk - FreeSWITCH Mailing Lists

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-392-gb6c9986
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via b6c998685330b7c689cd08726438271ac68f0361 (commit) from 75bbd885eb1eef0bcfea9b5371557823ca584522 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b6c998685330b7c689cd08726438271ac68f0361 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 14:26:55 2011 -0600 add quotes on path diff --git a/mitchcapper/FSClient/FSClient.csproj b/mitchcapper/FSClient/FSClient.csproj index b12ef37..3e6aaa1 100644 --- a/mitchcapper/FSClient/FSClient.csproj +++ b/mitchcapper/FSClient/FSClient.csproj @@ -252,7 +252,7 @@ if not exist ".\conf" md conf copy ..\..\"external items"\conf\freeswitch.xml .\conf</PostBuildEvent> </PropertyGroup> <PropertyGroup> - <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy %25FREESWITCH_SRC_LOCATION%25\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent> + <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy "%25FREESWITCH_SRC_LOCATION%25"\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent> </PropertyGroup> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/FSClient.csproj | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-391-g75bbd88
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 75bbd885eb1eef0bcfea9b5371557823ca584522 (commit) from 274a7dd627ab98012ebf26c68c0ed5f440fa9033 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75bbd885eb1eef0bcfea9b5371557823ca584522 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 14:10:08 2011 -0600 try to fix the localization install fail again diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs index b59f5f8..2e95778 100644 --- a/mitchcapper/FSClient/Setup/FSCore.wxs +++ b/mitchcapper/FSClient/Setup/FSCore.wxs @@ -18,7 +18,7 @@ <Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*"> <File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" /> <CreateFolder Directory="INSTALLLOCATION"> - <Permission User="Users" GenericAll="yes" /> + <PermissionEx User="Users" GenericRead="yes" GenericWrite="yes" CreateFile="yes" xmlns="http://schemas.microsoft.com/wix/UtilExtension"/> </CreateFolder> </Component> <Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*"> diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj index 62c873c..7fea603 100644 --- a/mitchcapper/FSClient/Setup/Setup.wixproj +++ b/mitchcapper/FSClient/Setup/Setup.wixproj @@ -72,6 +72,10 @@ </BootstrapperFile> </ItemGroup> <ItemGroup> + <WixExtension Include="WixUtilExtension"> + <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath> + <Name>WixUtilExtension</Name> + </WixExtension> <WixExtension Include="WixNetFxExtension"> <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath> <Name>WixNetFxExtension</Name> ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Setup/FSCore.wxs | 2 +- mitchcapper/FSClient/Setup/Setup.wixproj | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-390-g274a7dd
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 274a7dd627ab98012ebf26c68c0ed5f440fa9033 (commit) from 2bd0da508187e942e4c906275e286cefedb3a62e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 274a7dd627ab98012ebf26c68c0ed5f440fa9033 Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Wed Feb 2 10:02:48 2011 -0800 Reset contact search bar string on escape or dial diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs index 0372d51..0195525 100644 --- a/mitchcapper/FSClient/Broker.cs +++ b/mitchcapper/FSClient/Broker.cs @@ -229,7 +229,7 @@ namespace FSClient { public void DialString(String str){ if (string.IsNullOrWhiteSpace(str)) return; - MainWindowRemoveFocus(); + MainWindowRemoveFocus(true); if (str.StartsWith("#") && str.Length > 2) { String acct_num = str.Substring(1, 1); @@ -572,8 +572,8 @@ namespace FSClient { public OurAutoCompleteBox GetContactSearchBox() { return MainWindow.get_instance().GetContactSearchBox(); } - public void MainWindowRemoveFocus(){ - MainWindow.get_instance().RemoveFocus(); + public void MainWindowRemoveFocus(bool ResetContactSearchText=false){ + MainWindow.get_instance().RemoveFocus(ResetContactSearchText); } private delegate void BroadcastEventDel(FSEvent evt); BroadcastEventDel BroadcastHandler; diff --git a/mitchcapper/FSClient/MainWindow.xaml.cs b/mitchcapper/FSClient/MainWindow.xaml.cs index 2dd780b..2201cf0 100644 --- a/mitchcapper/FSClient/MainWindow.xaml.cs +++ b/mitchcapper/FSClient/MainWindow.xaml.cs @@ -268,8 +268,10 @@ namespace FSClient { } - public void RemoveFocus(){ + public void RemoveFocus(bool ResetContactSearchText=false){ btnMute.Focus(); //should really divert focus a better way + if (ResetContactSearchText) + ResetContactSearchStr(); } @@ -424,10 +426,11 @@ namespace FSClient { return txtSearchBox; } + private const string contact_search_text = "Contact Search"; private void txtSearchBox_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e) { text_interception_enabled = false; txtSearchBox.Opacity = 1; - if (txtSearchBox.Text == "Contact Search") + if (txtSearchBox.Text == contact_search_text) txtSearchBox.Text = ""; } @@ -436,7 +439,10 @@ namespace FSClient { txtSearchBox.Opacity = 0.8; if (String.IsNullOrWhiteSpace(txtSearchBox.Text)) - txtSearchBox.Text = "Contact Search"; + ResetContactSearchStr(); + } + public void ResetContactSearchStr(){ + txtSearchBox.Text = contact_search_text; } private bool ContactMenuOpen; diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs index d2fbc41..4575f30 100644 --- a/mitchcapper/FSClient/SimpleContactPluginBase.cs +++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs @@ -150,7 +150,7 @@ namespace FSClient if (e.Key == Key.Enter) call_current_contact(); else if (e.Key == Key.Escape) - Broker.get_instance().MainWindowRemoveFocus(); + Broker.get_instance().MainWindowRemoveFocus(true); } protected OurAutoCompleteBox search_box; ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Broker.cs | 6 +++--- mitchcapper/FSClient/MainWindow.xaml.cs | 12 +++++++++--- mitchcapper/FSClient/SimpleContactPluginBase.cs | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-389-g2bd0da5
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 2bd0da508187e942e4c906275e286cefedb3a62e (commit) via 594536af195a45e9515ff1c40979a3f036934e49 (commit) via 4a414482ddc08fe77a42daab560a1bd860235154 (commit) from 48590eca54e7c93ef987768a24a844dfd72986d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2bd0da508187e942e4c906275e286cefedb3a62e Merge: 48590ec 594536a Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Wed Feb 2 09:43:04 2011 -0800 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit 594536af195a45e9515ff1c40979a3f036934e49 Merge: 4a41448 3f2c531 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 09:29:16 2011 -0600 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit 4a414482ddc08fe77a42daab560a1bd860235154 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 09:28:49 2011 -0600 Fix installation problem - with non English locales diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs index ac22889..b59f5f8 100644 --- a/mitchcapper/FSClient/Setup/FSCore.wxs +++ b/mitchcapper/FSClient/Setup/FSCore.wxs @@ -18,7 +18,7 @@ <Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*"> <File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" /> <CreateFolder Directory="INSTALLLOCATION"> - <Permission User="Authenticated Users" GenericAll="yes" /> + <Permission User="Users" GenericAll="yes" /> </CreateFolder> </Component> <Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*"> ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Setup/FSCore.wxs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-386-g48590ec
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated discards 594536af195a45e9515ff1c40979a3f036934e49 (commit) discards 4a414482ddc08fe77a42daab560a1bd860235154 (commit) via 48590eca54e7c93ef987768a24a844dfd72986d1 (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 (594536af195a45e9515ff1c40979a3f036934e49) \ N -- N -- N (48590eca54e7c93ef987768a24a844dfd72986d1) 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. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 48590eca54e7c93ef987768a24a844dfd72986d1 Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Wed Feb 2 09:42:55 2011 -0800 Added ability to remove focus to main window in broker, and made simplecontact base do this on escape in the box diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs index e0098b7..0372d51 100644 --- a/mitchcapper/FSClient/Broker.cs +++ b/mitchcapper/FSClient/Broker.cs @@ -6,8 +6,8 @@ using System.Windows; using System.Windows.Controls; using System.Xml; -using FreeSWITCH.Native; -using FSClient.Controls; +using FreeSWITCH.Native; +using FSClient.Controls; using Timer = System.Timers.Timer; namespace FSClient { @@ -229,7 +229,7 @@ namespace FSClient { public void DialString(String str){ if (string.IsNullOrWhiteSpace(str)) return; - MainWindow.get_instance().RemoveFocus(); + MainWindowRemoveFocus(); if (str.StartsWith("#") && str.Length > 2) { String acct_num = str.Substring(1, 1); @@ -567,11 +567,14 @@ namespace FSClient { if (BroadcastHandler == null) BroadcastHandler = new BroadcastEventDel(BroadcastEvent); Application.Current.Dispatcher.BeginInvoke(BroadcastHandler, new object[] { new FSEvent(args.EventObj) }); - } - + } + public OurAutoCompleteBox GetContactSearchBox() { return MainWindow.get_instance().GetContactSearchBox(); } + public void MainWindowRemoveFocus(){ + MainWindow.get_instance().RemoveFocus(); + } private delegate void BroadcastEventDel(FSEvent evt); BroadcastEventDel BroadcastHandler; private void BroadcastEvent(FSEvent evt) { diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs index bcf73d1..d2fbc41 100644 --- a/mitchcapper/FSClient/SimpleContactPluginBase.cs +++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Windows; using System.Windows.Controls; @@ -49,25 +49,25 @@ namespace FSClient MenuItem item = new MenuItem(); item.Click += item_Click; item.Header = "Edit Contact"; - items.Add(item); - item = new MenuItem(); - item.Click +=contact_call_click; - item.Header = "Call"; + items.Add(item); + item = new MenuItem(); + item.Click +=contact_call_click; + item.Header = "Call"; items.Add(item); return items; - } - - private void contact_call_click(object sender, RoutedEventArgs e){ - MenuItem item = sender as MenuItem; - if (item == null) - return; - - SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry; - if (entry == null) - return; - Broker.get_instance().DialString(entry.number); - } - + } + + private void contact_call_click(object sender, RoutedEventArgs e){ + MenuItem item = sender as MenuItem; + if (item == null) + return; + + SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry; + if (entry == null) + return; + Broker.get_instance().DialString(entry.number); + } + protected void item_Click(object sender, RoutedEventArgs e) { MenuItem item = sender as MenuItem; @@ -82,8 +82,8 @@ namespace FSClient default_edit_value = DefaultEditValue(c); } else{ - SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry; - + SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry; + if (entry == null) return; number = entry.number; @@ -147,9 +147,10 @@ namespace FSClient } } protected void search_box_PreviewKeyUp(object sender, KeyEventArgs e){ - if (e.Key == Key.Enter){ - call_current_contact(); - } + if (e.Key == Key.Enter) + call_current_contact(); + else if (e.Key == Key.Escape) + Broker.get_instance().MainWindowRemoveFocus(); } protected OurAutoCompleteBox search_box; @@ -165,19 +166,19 @@ namespace FSClient real_search_box.ContextMenu.Items.Add(item); } - search_box.PreviewKeyUp += search_box_PreviewKeyUp; + search_box.PreviewKeyUp += search_box_PreviewKeyUp; search_box.MouseDoubleClick += search_box_MouseDoubleClick; if (number_to_alias.Count > 0) refresh_search_box(); return true; - } - protected void call_current_contact(){ - SearchAutoCompleteEntry entry = search_box.SelectedItem as SearchAutoCompleteEntry; - if (entry != null) - Broker.get_instance().DialString(entry.number); - } - void search_box_MouseDoubleClick(object sender, MouseButtonEventArgs e){ - call_current_contact(); + } + protected void call_current_contact(){ + SearchAutoCompleteEntry entry = search_box.SelectedItem as SearchAutoCompleteEntry; + if (entry != null) + Broker.get_instance().DialString(entry.number); + } + void search_box_MouseDoubleClick(object sender, MouseButtonEventArgs e){ + call_current_contact(); } void search_box_ContextMenuOpening(object sender, ContextMenuEventArgs e){ ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Broker.cs | 13 +++-- mitchcapper/FSClient/Setup/FSCore.wxs | 2 +- mitchcapper/FSClient/SimpleContactPluginBase.cs | 65 ++++++++++++----------- 3 files changed, 42 insertions(+), 38 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch] FreeSWITCH Source branch master updated. git2svn-syncpoint-master-1686-g89c5f3b
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH Source". The branch, master has been updated via 89c5f3bf8226bf605336b66e7761fd9f753d935a (commit) from 83dea0ee45a1eed53fe6c7bcac96410229c2fe3c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 89c5f3bf8226bf605336b66e7761fd9f753d935a Author: Brian West <brian(a)freeswitch.org> Date: Wed Feb 2 11:04:39 2011 -0600 FS-3023 diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h index 0bd2a8b..f4a0922 100644 --- a/src/include/switch_cpp.h +++ b/src/include/switch_cpp.h @@ -68,6 +68,10 @@ Note that the first parameter to the new operator is implicitly handled by c++.. SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg); SWITCH_DECLARE(void) consoleCleanLog(char *msg); +SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *body = NULL, + char *file = NULL, char *convert_cmd = NULL, char *convert_ext = NULL); + + class CoreSession; class IVRMenu { diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index e91de6d..71e9f99 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -33352,6 +33352,30 @@ SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) { } +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) { + unsigned int jresult ; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + char *arg5 = (char *) NULL ; + char *arg6 = (char *) NULL ; + char *arg7 = (char *) NULL ; + bool result; + + arg1 = (char *)jarg1; + arg2 = (char *)jarg2; + arg3 = (char *)jarg3; + arg4 = (char *)jarg4; + arg5 = (char *)jarg5; + arg6 = (char *)jarg6; + arg7 = (char *)jarg7; + result = (bool)email(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16) { void * jresult ; IVRMenu *arg1 = (IVRMenu *) 0 ; diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index 1f02c3f..c640199 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -5364,6 +5364,11 @@ public class freeswitch { freeswitchPINVOKE.consoleCleanLog(msg); } + public static bool email(string to, string from, string headers, string body, string file, string convert_cmd, string convert_ext) { + bool ret = freeswitchPINVOKE.email(to, from, headers, body, file, convert_cmd, convert_ext); + return ret; + } + public static void console_log(string level_str, string msg) { freeswitchPINVOKE.console_log(level_str, msg); } @@ -13588,6 +13593,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_consoleCleanLog")] public static extern void consoleCleanLog(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_email")] + public static extern bool email(string jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7); + [DllImport("mod_managed", EntryPoint="CSharp_new_IvrMenu")] public static extern IntPtr new_IvrMenu(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16); diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp index bbcd05d..c62946b 100644 --- a/src/switch_cpp.cpp +++ b/src/switch_cpp.cpp @@ -1195,6 +1195,13 @@ SWITCH_DECLARE(void) console_clean_log(char *msg) switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_DEBUG, "%s", switch_str_nil(msg)); } +SWITCH_DECLARE(bool) email(char *to, char *from, char *headers, char *body, char *file, char *convert_cmd, char *convert_ext) +{ + if (switch_simple_email(to, from, headers, body, file, convert_cmd, convert_ext) == SWITCH_TRUE) { + return true; + } + return false; +} SWITCH_DECLARE(void) msleep(unsigned ms) { ----------------------------------------------------------------------- Summary of changes: src/include/switch_cpp.h | 4 +++ src/mod/languages/mod_managed/freeswitch_wrap.cxx | 24 +++++++++++++++++++++ src/mod/languages/mod_managed/managed/swig.cs | 8 +++++++ src/switch_cpp.cpp | 7 ++++++ 4 files changed, 43 insertions(+), 0 deletions(-) hooks/post-receive -- FreeSWITCH Source

1 0

[freeswitch] FreeSWITCH Source branch master updated. git2svn-syncpoint-master-1685-g83dea0e
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH Source". The branch, master has been updated via 83dea0ee45a1eed53fe6c7bcac96410229c2fe3c (commit) from 10d696ebacedde5416e99f03911c928eea8889d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 83dea0ee45a1eed53fe6c7bcac96410229c2fe3c Author: Anthony Minessale <anthm(a)freeswitch.org> Date: Wed Feb 2 10:53:33 2011 -0600 FS-3024 diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 35311c9..2db2a0d 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -1409,9 +1409,13 @@ static void core_event_handler(switch_event_t *event) } break; case SWITCH_EVENT_CHANNEL_UNBRIDGE: - new_sql() = switch_mprintf("delete from calls where (caller_uuid='%s' or callee_uuid='%q') and hostname='%q'", - switch_event_get_header_nil(event, "caller-unique-id"), switch_core_get_variable("hostname")); - break; + { + char *uuid = switch_event_get_header_nil(event, "caller-unique-id"); + + new_sql() = switch_mprintf("delete from calls where (caller_uuid='%q' or callee_uuid='%q') and hostname='%q'", + uuid, uuid, switch_core_get_variable("hostname")); + break; + } case SWITCH_EVENT_SHUTDOWN: new_sql() = switch_mprintf("delete from channels where hostname='%q';" "delete from interfaces where hostname='%q';" ----------------------------------------------------------------------- Summary of changes: src/switch_core_sqldb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- FreeSWITCH Source

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-387-g594536a
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 594536af195a45e9515ff1c40979a3f036934e49 (commit) via 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit) via fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) from 4a414482ddc08fe77a42daab560a1bd860235154 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 594536af195a45e9515ff1c40979a3f036934e49 Merge: 4a41448 3f2c531 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 09:29:16 2011 -0600 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit 3f2c531df509383cd93d9ae4379bfb656a969c7e Merge: fc1ff4f 4277bdb Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:29:18 2011 -0800 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:28:48 2011 -0800 Minor text changes to make things clearer diff --git a/mitchcapper/FSClient/README.txt b/mitchcapper/FSClient/README.txt index 6863643..68288a3 100644 --- a/mitchcapper/FSClient/README.txt +++ b/mitchcapper/FSClient/README.txt @@ -22,7 +22,7 @@ Plugins There are two native headset plugins provided for Jabra and Plantronics headsets. If you do not have one of these you can still leave the plugin in the directory it will not harm anything. If you do have one of these headsets you will then be able to select the headset in the options. This will automatically open/close the audio link, support muting and buttons, caller id, etc in the headset. You may need the runtime/sdk for the headset installed for it to work. Contact Plugins - There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc. + There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. Control +F or click in the contact search box on the bottom right, search by name right click for options. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc. Plugin Development FSClient was made to make it easy to extend through plugins. The two plugin types supported are noted above. Writing a plugin is exceptionally easy, you simply inherit the base interface fill in a few functions and are good to go. Use the above for examples. As for how easy, well the SimpleXML Contact Plugin was written in under an hour and under 100 lines of code. Writing plugins is easiest in a .net language (although you can write them in any language). FSClient will try to load any plugins in the plugin dir. diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs index 15fd750..f33d963 100644 --- a/mitchcapper/FSClient/Sofia.cs +++ b/mitchcapper/FSClient/Sofia.cs @@ -126,7 +126,7 @@ namespace FSClient { master_profile_ok = true; String res = Utils.api_exec("sofia", "status profile softphone"); if (res.Trim() == "Invalid Profile!") { - 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 + ") is free(set under the Advanced tab of in the sofia settings), otherwise check the freeswitch.log for more details. You can try reloading the sofia profile by editing the sofia settings and clicking save."); + 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 + ") 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."); master_profile_ok = false; } diff --git a/mitchcapper/FSClient/TODO.txt b/mitchcapper/FSClient/TODO.txt index 7e3f1fb..4e65bb3 100644 --- a/mitchcapper/FSClient/TODO.txt +++ b/mitchcapper/FSClient/TODO.txt @@ -1,4 +1,2 @@ -Better address book integration. Right now the integration is pretty lame to say the least, you cannot lookup contacts or do much in the way of editing them. I think a nice interm solution would be a control + f support to find a contact to atleast make outgoing calls. Right now contact plugins can add right click menus but maybe making a more central way for them to add right click options so they don't have to do so much work would be better. -Volume control / gain. Right now you can use the system volume to adjust things but it would be nice to have this built into the GUI and also have a gain option. Gain would require changes to portaudio to support it most likely (although should be decently simple) or using set_audio_level. -- Partially implemented now with the ability to set audio levels on a call by right clicking on it. Plugin control, ability to enable or disable plugins from the options menu. Figure out a way to sort codecs, a draggable combo box may work well. \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/README.txt | 2 +- mitchcapper/FSClient/Sofia.cs | 2 +- mitchcapper/FSClient/TODO.txt | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-384-g4a41448
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated discards 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit) discards fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) via 4a414482ddc08fe77a42daab560a1bd860235154 (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 (3f2c531df509383cd93d9ae4379bfb656a969c7e) \ N -- N -- N (4a414482ddc08fe77a42daab560a1bd860235154) 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. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4a414482ddc08fe77a42daab560a1bd860235154 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 09:28:49 2011 -0600 Fix installation problem - with non English locales diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs index ac22889..b59f5f8 100644 --- a/mitchcapper/FSClient/Setup/FSCore.wxs +++ b/mitchcapper/FSClient/Setup/FSCore.wxs @@ -18,7 +18,7 @@ <Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*"> <File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" /> <CreateFolder Directory="INSTALLLOCATION"> - <Permission User="Authenticated Users" GenericAll="yes" /> + <Permission User="Users" GenericAll="yes" /> </CreateFolder> </Component> <Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*"> ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/README.txt | 2 +- mitchcapper/FSClient/Setup/FSCore.wxs | 2 +- mitchcapper/FSClient/Sofia.cs | 2 +- mitchcapper/FSClient/TODO.txt | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-385-g3f2c531
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit) via 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa (commit) from fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f2c531df509383cd93d9ae4379bfb656a969c7e Merge: fc1ff4f 4277bdb Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:29:18 2011 -0800 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Tue Feb 1 23:15:44 2011 -0600 add dependency for new file diff --git a/mitchcapper/FSClient/Setup/FSClient.wxs b/mitchcapper/FSClient/Setup/FSClient.wxs index 68d0886..ba6960a 100644 --- a/mitchcapper/FSClient/Setup/FSClient.wxs +++ b/mitchcapper/FSClient/Setup/FSClient.wxs @@ -4,6 +4,7 @@ <ComponentGroup Id="FSClientComp"> <ComponentRef Id="cmp98E16C7E23D449F3BC0ECF003543C3F9"/> <ComponentRef Id="cmp32DB946E4669A895FAC4826678D1CE7A"/> + <ComponentRef Id="cmpD17CBE22A3B94CCE9CF46B849289D40D"/> </ComponentGroup> <DirectoryRef Id="INSTALLLOCATION"> <Component Id="cmp98E16C7E23D449F3BC0ECF003543C3F9" Guid="*"> @@ -12,6 +13,9 @@ <Component Id="cmp32DB946E4669A895FAC4826678D1CE7A" Guid="*"> <File Id="filE4CB78ABCF2AE91B89FB0446A607E70C" KeyPath="yes" Source="$(var.FSClient.TargetDir)\WPFToolkit.dll" /> </Component> + <Component Id="cmpD17CBE22A3B94CCE9CF46B849289D40D" Guid="*"> + <File Id="fil00037BE15D6A4893973045263EA4B117" KeyPath="yes" Source="$(var.FSClient.TargetDir)\System.Windows.Controls.Input.Toolkit.dll" /> + </Component> </DirectoryRef> </Fragment> </Wix> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Setup/FSClient.wxs | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0