aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2012-06-01 08:41:50 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2012-06-01 08:41:50 +0000
commit97f00d4a432a0688f1446c5bf10d92e5a60c0cf8 (patch)
tree942362de0c3646e2e3f92a3c0240486d1888b507 /resources
parent4b00ebbb7e12aa763e9528c6ea145ba17c937469 (diff)
downloadjitsi-97f00d4a432a0688f1446c5bf10d92e5a60c0cf8.zip
jitsi-97f00d4a432a0688f1446c5bf10d92e5a60c0cf8.tar.gz
jitsi-97f00d4a432a0688f1446c5bf10d92e5a60c0cf8.tar.bz2
Integrates Jitsi presence, IM and VoIP with MS Outlook.
Diffstat (limited to 'resources')
-rw-r--r--resources/install/windows/SCRegistrySpec.wxi27
-rw-r--r--resources/install/windows/installer-windows.wxs1
2 files changed, 28 insertions, 0 deletions
diff --git a/resources/install/windows/SCRegistrySpec.wxi b/resources/install/windows/SCRegistrySpec.wxi
index 99598ab..ae24a7c 100644
--- a/resources/install/windows/SCRegistrySpec.wxi
+++ b/resources/install/windows/SCRegistrySpec.wxi
@@ -67,6 +67,33 @@
</RegistryKey>
</Component>
+ <Component
+ Id="Component_MsOfficeCommRegistryEntries_X86"
+ Directory="TARGETDIR"
+ Guid="9a590be3-d2c6-48e6-8d6a-a8ca71ad0aac"
+ Win64="no">
+ <Condition><![CDATA[CREATE_MSOFFICECOMM_REGISTRY_ENTRIES = 1]]></Condition>
+ <RegistryKey Action="createAndRemoveOnUninstall"
+ Key="SOFTWARE\Microsoft\Office\Outlook\Call Integration"
+ Root="HKLM">
+ <RegistryValue Name="IMApplication" Type="string" Value="run.exe" />
+ </RegistryKey>
+ </Component>
+<?if $(var.Platform) = x64 ?>
+ <Component
+ Id="Component_MsOfficeCommRegistryEntries_X64"
+ Directory="TARGETDIR"
+ Guid="ce3c9a0f-1876-470e-823c-a29d7b7fcb26"
+ Win64="yes">
+ <Condition><![CDATA[CREATE_MSOFFICECOMM_REGISTRY_ENTRIES = 1]]></Condition>
+ <RegistryKey Action="createAndRemoveOnUninstall"
+ Key="SOFTWARE\Microsoft\Office\Outlook\Call Integration"
+ Root="HKLM">
+ <RegistryValue Name="IMApplication" Type="string" Value="run.exe" />
+ </RegistryKey>
+ </Component>
+<?endif ?>
+
</ComponentGroup>
</Fragment>
</Include>
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index 99b0ab2..0bf0ea5 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -473,6 +473,7 @@
sense to associate SIP Communicator with the FEED protocol.
-->
<Property Id="CREATE_FEED_REGISTRY_ENTRIES" Value="0" />
+<Property Id="CREATE_MSOFFICECOMM_REGISTRY_ENTRIES" Value="1" />
<Property Id="CREATE_SIP_REGISTRY_ENTRIES" Value="1" />
<Property Id="CREATE_XMPP_REGISTRY_ENTRIES" Value="1" />
<Property Id="IS_AUTOUPDATE" Value="0" Hidden="yes" />