<h1>Project "FreeSWITCH user-contributed scripts, etc" received a push.</h1>

<h2>branch: master updated</h2>
<pre>
       via: eadf3dc00f690257a7ee04949bc5b676cb6b622f (commit)
       via: d55d498c5d54b30055551e683d5e28b6bf2253f8 (commit)
       via: 44e02296787e6776b62d528872eed216c8835fc6 (commit)
       via: 577fc9ba2ce176c24897eac5382d4c8239f204f0 (commit)
       via: d2a9bb867d3c01d38ea12fa655b65ad68c0b24e0 (commit)
       via: faf08b1841ee3f0807afd3d886066aeb3776f739 (commit)
      from: 729cc6d3ea25ff83efa9f1cb344cf066eee69efe (commit)


</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Raymond Chandler
comments: 
Merge branch &#39;master&#39; of git.freeswitch.org:freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments: 
Merge branch &#39;master&#39; of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Mitch Capper
comments: 
merged setup changes

<span style="color: #000080; font-weight: bold">diff --cc mitchcapper/FSClient/Setup/Product.wxs</span>
<span style="color: #000080; font-weight: bold">index 4cbf2a3,0ab94b7..bb93a12</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">@@@ -11,10 -11,9 +11,10 @@@</span>
  &lt;?endif ?&gt;
  
  &lt;Wix xmlns=&quot;http://schemas.microsoft.com/wix/2006/wi&quot;
 +         xmlns:util=&quot;http://schemas.microsoft.com/wix/UtilExtension&quot;
                xmlns:netfx=&quot;http://schemas.microsoft.com/wix/NetFxExtension&quot;&gt;
 -        &lt;Product Id=&quot;f20f4348-01f9-457f-9112-60edb77761f4&quot; Name=&quot;$(var.ProductName)&quot; Language=&quot;1033&quot; Version=&quot;1.0.0.0&quot; Manufacturer=&quot;FreeSWITCH&quot; UpgradeCode=&quot;7668faef-2ab3-4079-a986-07a33739b42e&quot;&gt;
 +        &lt;Product Id=&quot;*&quot; Name=&quot;$(var.ProductName)&quot; Language=&quot;1033&quot; Version=&quot;1.0.1.0&quot; Manufacturer=&quot;FreeSWITCH&quot; UpgradeCode=&quot;7668FAEF-2AB3-4079-A986-07A33739B42E&quot;&gt;
<span style="color: #A00000">-                 &lt;Package InstallerVersion=&quot;200&quot; Compressed=&quot;yes&quot; /&gt;</span>
<span style="color: #00A000">+                 &lt;Package InstallerVersion=&quot;300&quot; Compressed=&quot;yes&quot; /&gt;</span>
  
                  &lt;Media Id=&quot;1&quot; Cabinet=&quot;media1.cab&quot; EmbedCab=&quot;yes&quot; /&gt;
  
<span style="color: #800080; font-weight: bold">@@@ -28,85 -27,64 +28,85 @@@</span>
                                  &lt;Directory Id=&quot;INSTALLLOCATION&quot; Name=&quot;FSClient&quot;&gt;
                                          &lt;!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. --&gt;
                                          &lt;!-- &lt;Component Id=&quot;ProductComponent&quot; Guid=&quot;594203af-235a-4a7d-aff8-045997f872ec&quot;&gt; --&gt;
<span style="color: #A00000">-                                         &lt;!-- TODO: Insert files, registry keys, and other resources here. --&gt;</span>
<span style="color: #00A000">+                                                 &lt;!-- TODO: Insert files, registry keys, and other resources here. --&gt;</span>
                                          &lt;!-- &lt;/Component&gt; --&gt;
<span style="color: #A00000">-                                         &lt;Directory Id=&quot;MODLOCATION&quot; Name=&quot;Mod&quot;&gt;</span>
<span style="color: #A00000">-                                         &lt;/Directory&gt;</span>
<span style="color: #A00000">-                                         &lt;Directory Id=&quot;CONFLOCATION&quot; Name=&quot;Conf&quot;&gt;</span>
<span style="color: #A00000">-                                         &lt;/Directory&gt;</span>
<span style="color: #A00000">-                                         &lt;Directory Id=&quot;PLUGINLOCATION&quot; Name=&quot;Plugins&quot;&gt;</span>
<span style="color: #A00000">-                                         &lt;/Directory&gt;</span>
<span style="color: #00A000">+           &lt;Directory Id=&quot;MODLOCATION&quot; Name=&quot;Mod&quot;&gt;</span>
<span style="color: #00A000">+           &lt;/Directory&gt;</span>
<span style="color: #00A000">+           &lt;Directory Id=&quot;CONFLOCATION&quot; Name=&quot;Conf&quot;&gt;</span>
<span style="color: #00A000">+           &lt;/Directory&gt;</span>
<span style="color: #00A000">+           &lt;Directory Id=&quot;PLUGINLOCATION&quot; Name=&quot;Plugins&quot;&gt;</span>
<span style="color: #00A000">+           &lt;/Directory&gt;</span>
                                  &lt;/Directory&gt;
                          &lt;/Directory&gt;
<span style="color: #A00000">-                         &lt;?if $(var.Platform) != x64 ?&gt;</span>
<span style="color: #A00000">-                         &lt;Merge Id=&quot;CrtFiles_x86&quot;</span>
<span style="color: #A00000">-                         SourceFile=&quot;$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm&quot;</span>
<span style="color: #A00000">-                         DiskId=&quot;1&quot;</span>
<span style="color: #A00000">-                         Language=&quot;1033&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;?endif ?&gt;</span>
<span style="color: #A00000">-                         &lt;?if $(var.Platform) = x64 ?&gt;</span>
<span style="color: #A00000">-                         &lt;Merge Id=&quot;CrtFiles_x64&quot;</span>
<span style="color: #A00000">-                         SourceFile=&quot;$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm&quot;</span>
<span style="color: #A00000">-                         DiskId=&quot;1&quot;</span>
<span style="color: #A00000">-                         Language=&quot;1033&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;?endif ?&gt;</span>
<span style="color: #A00000">-                         &lt;Directory Id=&quot;ProgramMenuFolder&quot;&gt;</span>
<span style="color: #A00000">-                                 &lt;Directory Id=&quot;ApplicationProgramsFolder&quot; Name=&quot;FSClient&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;/Directory&gt;</span>
<span style="color: #00A000">+       &lt;?if $(var.Platform) != x64 ?&gt;</span>
<span style="color: #00A000">+       &lt;Merge Id=&quot;CrtFiles_x86&quot;</span>
<span style="color: #00A000">+       SourceFile=&quot;$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm&quot;</span>
<span style="color: #00A000">+       DiskId=&quot;1&quot;</span>
<span style="color: #00A000">+       Language=&quot;1033&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;?endif ?&gt;</span>
<span style="color: #00A000">+       &lt;?if $(var.Platform) = x64 ?&gt;</span>
<span style="color: #00A000">+       &lt;Merge Id=&quot;CrtFiles_x64&quot;</span>
<span style="color: #00A000">+       SourceFile=&quot;$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm&quot;</span>
<span style="color: #00A000">+       DiskId=&quot;1&quot;</span>
<span style="color: #00A000">+       Language=&quot;1033&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;?endif ?&gt;</span>
<span style="color: #00A000">+       &lt;Directory Id=&quot;ProgramMenuFolder&quot;&gt;</span>
<span style="color: #00A000">+         &lt;Directory Id=&quot;ApplicationProgramsFolder&quot; Name=&quot;FSClient&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;/Directory&gt;</span>
                  &lt;/Directory&gt;
  
<span style="color: #A00000">-                 &lt;DirectoryRef Id=&quot;ApplicationProgramsFolder&quot;&gt;</span>
<span style="color: #A00000">-                         &lt;Component Id=&quot;ApplicationShortcut&quot; Guid=&quot;20BC8446-684B-44F5-A1E3-AF6010EAF37C&quot;&gt;</span>
<span style="color: #A00000">-                                 &lt;Shortcut Id=&quot;ApplicationStartMenuShortcut&quot;</span>
<span style="color: #A00000">-                                                                          Name=&quot;FSClient&quot;</span>
<span style="color: #A00000">-                                                                          Description=&quot;FreeSWITCH Windows Phone&quot;</span>
<span style="color: #A00000">-                                                                          Target=&quot;[INSTALLLOCATION]FSClient.exe&quot;</span>
<span style="color: #A00000">-                                                                          WorkingDirectory=&quot;INSTALLLOCATION&quot;/&gt;</span>
<span style="color: #00A000">+     &lt;DirectoryRef Id=&quot;ApplicationProgramsFolder&quot;&gt;</span>
<span style="color: #00A000">+       &lt;Component Id=&quot;ApplicationShortcut&quot; Guid=&quot;20BC8446-684B-44F5-A1E3-AF6010EAF37C&quot;&gt;</span>
<span style="color: #00A000">+         &lt;Shortcut Id=&quot;ApplicationStartMenuShortcut&quot;</span>
<span style="color: #00A000">+                                                          Name=&quot;FSClient&quot;</span>
<span style="color: #00A000">+                                                          Description=&quot;FreeSWITCH Windows Phone&quot;</span>
<span style="color: #00A000">+                                                          Target=&quot;[INSTALLLOCATION]FSClient.exe&quot;</span>
<span style="color: #00A000">+                                                          WorkingDirectory=&quot;INSTALLLOCATION&quot;/&gt;</span>
 +                                &lt;util:InternetShortcut Id=&quot;OnlineDocumentationShortcut&quot;
 +                                                                        Name=&quot;Online Documentation&quot;
 +                                                                        Target=&quot;http://wiki.freeswitch.com/wiki/FSClient&quot;/&gt;
 +                                &lt;Shortcut Id=&quot;UninstallProduct&quot;
 +                                                                          Name=&quot;Uninstall FSClient&quot;
 +                                                                          Target=&quot;[SystemFolder]msiexec.exe&quot;
 +                                                                          Arguments=&quot;/x [ProductCode]&quot;
 +                                                                          Description=&quot;Uninstalls FSClient&quot; /&gt;
 +
<span style="color: #A00000">-                                 &lt;RemoveFolder Id=&quot;ApplicationProgramsFolder&quot; On=&quot;uninstall&quot;/&gt;</span>
<span style="color: #A00000">-                                 &lt;RegistryValue Root=&quot;HKCU&quot; Key=&quot;Software\FreeSWITCH\FSClient&quot; Name=&quot;installed&quot; Type=&quot;integer&quot; Value=&quot;1&quot; KeyPath=&quot;yes&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;/Component&gt;</span>
<span style="color: #A00000">-                 &lt;/DirectoryRef&gt;</span>
<span style="color: #00A000">+         &lt;RemoveFolder Id=&quot;ApplicationProgramsFolder&quot; On=&quot;uninstall&quot;/&gt;</span>
<span style="color: #00A000">+         &lt;RegistryValue Root=&quot;HKCU&quot; Key=&quot;Software\FreeSWITCH\FSClient&quot; Name=&quot;installed&quot; Type=&quot;integer&quot; Value=&quot;1&quot; KeyPath=&quot;yes&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;/Component&gt;</span>
<span style="color: #00A000">+     &lt;/DirectoryRef&gt;</span>
  
                  &lt;Feature Id=&quot;ProductFeature&quot; Title=&quot;FSClient Core&quot; Level=&quot;1&quot;&gt;
                          &lt;!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. --&gt;
<span style="color: #A00000">-                         &lt;!-- &lt;ComponentRef Id=&quot;ProductComponent&quot; /&gt; --&gt;</span>
<span style="color: #A00000">-                         &lt;ComponentGroupRef Id=&quot;FSCoreComp&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;ComponentGroupRef Id=&quot;FSCoreModComp&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;ComponentRef Id=&quot;FSCoreConfComp&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;ComponentGroupRef Id=&quot;FSClientComp&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;ComponentRef Id=&quot;ApplicationShortcut&quot; /&gt;</span>
<span style="color: #A00000">- </span>
<span style="color: #00A000">+       &lt;!-- &lt;ComponentRef Id=&quot;ProductComponent&quot; /&gt; --&gt;</span>
<span style="color: #00A000">+       &lt;ComponentGroupRef Id=&quot;FSCoreComp&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;ComponentGroupRef Id=&quot;FSCoreModComp&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;ComponentRef Id=&quot;FSCoreConfComp&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;ComponentGroupRef Id=&quot;FSClientComp&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;ComponentRef Id=&quot;ApplicationShortcut&quot; /&gt;</span>
<span style="color: #00A000">+                         </span>
                          &lt;!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. --&gt;
                          &lt;ComponentGroupRef Id=&quot;Product.Generated&quot; /&gt;
<span style="color: #A00000">-                         &lt;?if $(var.Platform) != x64 ?&gt;</span>
<span style="color: #A00000">-                         &lt;MergeRef Id=&quot;CrtFiles_x86&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;?endif ?&gt;</span>
<span style="color: #A00000">-                         &lt;?if $(var.Platform) = x64 ?&gt;</span>
<span style="color: #A00000">-                         &lt;MergeRef Id=&quot;CrtFiles_x64&quot;/&gt;</span>
<span style="color: #A00000">-                         &lt;?endif ?&gt;</span>
<span style="color: #00A000">+       &lt;?if $(var.Platform) != x64 ?&gt;</span>
<span style="color: #00A000">+       &lt;MergeRef Id=&quot;CrtFiles_x86&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;?endif ?&gt;</span>
<span style="color: #00A000">+       &lt;?if $(var.Platform) = x64 ?&gt;</span>
<span style="color: #00A000">+       &lt;MergeRef Id=&quot;CrtFiles_x64&quot;/&gt;</span>
<span style="color: #00A000">+       &lt;?endif ?&gt;</span>
                  &lt;/Feature&gt;
<span style="color: #A00000">-                 &lt;Property Id=&quot;WIXUI_INSTALLDIR&quot; Value=&quot;INSTALLLOCATION&quot; /&gt;</span>
<span style="color: #A00000">-                 &lt;UIRef Id=&quot;WixUI_InstallDir&quot; /&gt;</span>
<span style="color: #00A000">+     &lt;Property Id=&quot;WIXUI_INSTALLDIR&quot; Value=&quot;INSTALLLOCATION&quot; /&gt;</span>
<span style="color: #00A000">+     &lt;UIRef Id=&quot;WixUI_InstallDir&quot; /&gt;</span>
 +                &lt;Property Id=&quot;WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT&quot; Value=&quot;Launch FSClient&quot; /&gt;
 +                &lt;Property Id=&quot;WixShellExecTarget&quot; Value=&quot;[INSTALLLOCATION]FSClient.exe&quot; /&gt;
 +                &lt;CustomAction Id=&quot;LaunchApplication&quot; BinaryKey=&quot;WixCA&quot; DllEntry=&quot;WixShellExec&quot; Impersonate=&quot;yes&quot; /&gt;
 +                &lt;UI&gt;
 +                        &lt;Publish Dialog=&quot;ExitDialog&quot; Control=&quot;Finish&quot; Event=&quot;DoAction&quot; Value=&quot;LaunchApplication&quot;&gt;WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed&lt;/Publish&gt;
 +                &lt;/UI&gt;
 +                &lt;WixVariable Id=&quot;WixUIBannerBmp&quot; Value=&quot;Banner.bmp&quot; /&gt;
 +                &lt;WixVariable Id=&quot;WixUIDialogBmp&quot; Value=&quot;Dialog.bmp&quot; /&gt;
 +                &lt;Icon Id=&quot;icon.ico&quot; SourceFile=&quot;../phone.ico&quot;/&gt;
 +                &lt;Property Id=&quot;ARPPRODUCTICON&quot; Value=&quot;icon.ico&quot; /&gt;
 +                &lt;MajorUpgrade DowngradeErrorMessage=&quot;A later version of [ProductName] is already installed. Setup will now exit.&quot; AllowSameVersionUpgrades=&quot;yes&quot;  /&gt;
 +
<span style="color: #A00000">-                 &lt;/Product&gt;</span>
<span style="color: #00A000">+         &lt;/Product&gt;</span>
  &lt;/Wix&gt;
</pre></div>
========================================================================<pre>

Summary of changes:
 mitchcapper/FSClient/Broker.cs                     |   23 ++++-
 mitchcapper/FSClient/External Items/link.pl        |  102 ++++++++++----------
 mitchcapper/FSClient/FSClient.sln                  |    4 +-
 mitchcapper/FSClient/Properties/AssemblyInfo.cs    |    6 +-
 .../FSClient/Properties/Settings.Designer.cs       |   12 +++
 mitchcapper/FSClient/Properties/Settings.settings  |    3 +
 mitchcapper/FSClient/Setup/Banner.bmp              |  Bin 0 -> 2380 bytes
 mitchcapper/FSClient/Setup/Dialog.bmp              |  Bin 0 -> 8896 bytes
 mitchcapper/FSClient/Setup/FSClient.wxs            |    4 -
 mitchcapper/FSClient/Setup/Product.wxs             |   24 +++++-
 mitchcapper/FSClient/Setup/Setup.wixproj           |    8 ++
 mitchcapper/FSClient/app.config                    |    3 +
 12 files changed, 125 insertions(+), 64 deletions(-)
 create mode 100644 mitchcapper/FSClient/Setup/Banner.bmp
 create mode 100644 mitchcapper/FSClient/Setup/Dialog.bmp
</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>