Adds Jitsi to the list of IM Providers in windows registry. Adds checkbox

to the windows installer and the Options dialog which allows the user to
make Jitsi the default IM provider.

5 files changed, 83 insertions, 5 deletions

diff --git a/resources/install/windows/SCRegistrySpec.wxi b/resources/install/windows/SCRegistrySpec.wxi
index 6876158..af2c5cd 100644
--- a/resources/install/windows/SCRegistrySpec.wxi
+++ b/resources/install/windows/SCRegistrySpec.wxi
@@ -80,7 +80,56 @@
           Type="string"

           Value="@APP_LAUNCHER_NAME@.exe" />

     </RegistryKey>

+  	<RegistryKey

+        Key="SOFTWARE\IM Providers\@APP_NAME@"

+        Root="HKLM" Action="createAndRemoveOnUninstall">

+      <RegistryValue

+          Name="FriendlyName"

+          Type="string"

+          Value="@APP_NAME@" />

+      <RegistryValue

+          Name="GUID"

+          Type="string"

+          Value="{8885370D-B33E-44B7-875D-28E403CF9270}" />

+      <RegistryValue

+          Name="ProcessName"

+          Type="string"

+          Value="@APP_LAUNCHER_NAME@.exe" />

+    </RegistryKey>

   </Component>

+  

+	<Component

+      Id="Component_SetDefaultIMProvider"

+      Directory="TARGETDIR"

+      Guid="abb6afe7-8787-4325-841e-a9181a09fcc9">

+    <Condition><![CDATA[SET_DEFAULT_IM_APP = 1]]></Condition>

+    <RegistryKey

+        Key="Software\IM Providers"

+        Root="HKCU">

+      <RegistryValue

+          KeyPath="yes"

+          Name="DefaultIMApp"

+          Type="string"

+          Value="@APP_NAME@" />

+    </RegistryKey>

+  </Component>

+  

+  <Component

+      Id="Component_UnsetDefaultIMProvider"

+      Directory="TARGETDIR"

+      Guid="47b4b7a0-d668-4bb0-9da1-7103e4c668d0">

+    <Condition><![CDATA[(IS_DEFAULT_IM_APP = "@APP_NAME@") AND ((SET_DEFAULT_IM_APP = 0) OR NOT (SET_DEFAULT_IM_APP))]]></Condition>

+    <RegistryKey

+        Key="Software\IM Providers"

+        Root="HKCU">

+      <RegistryValue

+          KeyPath="yes"

+          Name="DefaultIMApp"

+          Type="string"

+          Value="Communicator" />

+    </RegistryKey>

+  </Component>

+  

 <?if $(var.Platform) = x64 ?>

   <Component

       Id="Component_MsOfficeCommRegistryEntries_X64"

@@ -97,6 +146,22 @@
           Type="string"

           Value="@APP_LAUNCHER_NAME@.exe" />

     </RegistryKey>

+    <RegistryKey

+        Key="SOFTWARE\IM Providers\Jitsi"

+        Root="HKLM" Action="createAndRemoveOnUninstall">

+        <RegistryValue

+          Name="FriendlyName"

+          Type="string"

+          Value="Jisti" />

+      <RegistryValue

+          Name="GUID"

+          Type="string"

+          Value="{8885370D-B33E-44B7-875D-28E403CF9270}" />

+      <RegistryValue

+          Name="ProcessName"

+          Type="string"

+          Value="@APP_LAUNCHER_NAME@.exe" />

+    </RegistryKey>

   </Component>

 <?endif ?>

 

diff --git a/resources/install/windows/en-us.wxl b/resources/install/windows/en-us.wxl
index c4ae9b2..c64ea72 100644
--- a/resources/install/windows/en-us.wxl
+++ b/resources/install/windows/en-us.wxl
@@ -17,6 +17,7 @@
   <String Id="ShortcutsAndRegistryDlg_CreateDesktop" Overridable="yes">&amp;Desktop</String>

   <String Id="ShortcutsAndRegistryDlg_CreateAutoStart" Overridable="yes">&amp;Auto-start when computer restarts or reboots</String>

   <String Id="ShortcutsAndRegistryDlg_AssociateProtocols" Overridable="yes">&amp;Associate Protocols</String>

+  <String Id="ShortcutsAndRegistryDlg_DefaultIMApp" Overridable="yes">M&amp;ake [ProductName] the default Instant Messaging Provider (Outlook integration)</String>

 

   <String Id="WelcomeText1" Overridable="yes"><![CDATA[@WelcomeText1@]]></String>

   <String Id="WelcomeText2" Overridable="yes"><![CDATA[@WelcomeText2@]]></String>

diff --git a/resources/install/windows/fr-fr.wxl b/resources/install/windows/fr-fr.wxl
index e174a9d..76f7da7 100644
--- a/resources/install/windows/fr-fr.wxl
+++ b/resources/install/windows/fr-fr.wxl
@@ -17,6 +17,7 @@
   <String Id="ShortcutsAndRegistryDlg_CreateDesktop" Overridable="yes">Placer un accès direct sur le Bureau</String>

   <String Id="ShortcutsAndRegistryDlg_CreateAutoStart" Overridable="yes">Lancer automatiquement quand l’ordinateur démarre</String>

   <String Id="ShortcutsAndRegistryDlg_AssociateProtocols" Overridable="yes">&amp;Protocoles associés</String>

+  <String Id="ShortcutsAndRegistryDlg_DefaultIMApp" Overridable="yes">M&amp;ake [ProductName] the default Instant Messaging Provider (Outlook integration)</String>

 

   <String Id="WelcomeText1" Overridable="yes"><![CDATA[Ce logiciel est developpé par la communauté de [ProductName] ]]></String>

   <String Id="WelcomeText2" Overridable="yes"><![CDATA[Découvrir notre site : @APP_WEB@]]></String>

diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index c70623d..d7578fc 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -199,14 +199,16 @@
                 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />

                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />

 

-                <Control Id="ShortcutGroup" Type="GroupBox" X="20" Y="60" Width="330" Height="65" Text="!(loc.ShortcutsAndRegistryDlg_CreateShortcuts)" />

+                <Control Id="ShortcutGroup" Type="GroupBox" X="20" Y="60" Width="330" Height="80" Text="!(loc.ShortcutsAndRegistryDlg_CreateShortcuts)" />

                 <Control Id="StartMenuShortcutCheckBox" Type="CheckBox" X="25" Y="75" Width="320" Height="15" Property="CREATE_START_MENU_SHORTCUT" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_CreateStartMenu)" />

                 <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="90" Width="320" Height="15" Property="CREATE_DESKTOP_SHORTCUT" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_CreateDesktop)" />

                 <Control Id="StartupShortcutCheckBox" Type="CheckBox" X="25" Y="105" Width="320" Height="15" Property="HAS_STARTUP_REGISTRY" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_CreateAutoStart)" />

+                <Control Id="DefaultIMApplicationCheckBox" Type="CheckBox" X="25" Y="120" Width="320" Height="15" Property="SET_DEFAULT_IM_APP" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_DefaultIMApp)" />

 

-                <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="130" Width="330" Height="50" Text="!(loc.ShortcutsAndRegistryDlg_AssociateProtocols)" />

-                <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="145" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;SIP" />

-                <Control Id="XmppRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="160" Width="320" Height="15" Property="CREATE_XMPP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;XMPP" />

+                <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="145" Width="330" Height="50" Text="!(loc.ShortcutsAndRegistryDlg_AssociateProtocols)" />

+                <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="160" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;SIP" />

+                <Control Id="XmppRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="175" Width="320" Height="15" Property="CREATE_XMPP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&amp;XMPP" />

+                

             </Dialog>

 

             <Dialog Id="CleanSweepDlg" Width="370" Height="270" Title="!(loc.CleanSweepDlg_Title)">

@@ -440,6 +442,14 @@
 <SetProperty Id="HAS_STARTUP_REGISTRY" After="AppSearch" Value="[HAS_STARTUP_SHORTCUT]">

      HAS_STARTUP_SHORTCUT

 </SetProperty>

+<Property Id="IS_DEFAULT_IM_APP">

+  <RegistrySearch

+      Id="RegistrySearch_IsDefaultIMApp"

+      Key="Software\IM Providers"

+      Name="DefaultIMApp"

+      Root="HKCU"

+      Type="raw" />

+</Property>

 <Property Id="JRE_VERSION">

 <?ifdef JRESetup ?>

   <RegistrySearch

@@ -453,7 +463,7 @@
   1.5

 <?endif?>

 </Property>

-

+<Property Id="SET_DEFAULT_IM_APP" Value="1" />

 <Property Id="ARPCONTACT" Value="@APP_EMAIL@" />

 <Property Id="ARPHELPLINK" Value="@APP_WEB@" />

 <Property Id="ARPPRODUCTICON" Value="Icon.ico" />

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 8c410f3..e957d02 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -869,6 +869,7 @@ plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=Enable Microsoft Outlook search
 plugin.addrbook.DESCRIPTION=If enabled everything you type in the search field \
  of the contact list will be also searched in your system address book and all \
  matching contacts from your address book will appear in your contact list.
+ plugin.addrbook.DEFAULT_IM_APP=Make Jitsi the default Instant Messaging Provider (Outlook integration)
 plugin.addrbook.PREFIX=Specific phone number prefix
 plugin.addrbook.PREFIX_EXAMPLE=Ex.: 00