Delta Between Two Patch Sets: installer/src/msi/adblockplusie.wxs
Issue 5535282690523136:
Issue 1230 - Remove old social icons from the installer (Closed)
Left Patch Set:
Created Nov. 6, 2014, 10:20 a.m.
Right Patch Set: Remove remaining entries
Created Nov. 7, 2014, 2:24 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« installer/src/custom-action/test/test-close-application.wxs ('k')
|
no next file »
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <!-- | 2 <!-- |
| 3 Compilation Note: | 3 Compilation Note: |
| 4 You may see linking errors that look like these: | 4 You may see linking errors that look like these: |
| 5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote> | 5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote> |
| 6 The documentation for this error code talks about custom actions, | 6 The documentation for this error code talks about custom actions, |
| 7 even though the CustomAction keyword does not appear in this source. | 7 even though the CustomAction keyword does not appear in this source. |
| 8 Certain WiX elements are implemented by MSI custom actions, | 8 Certain WiX elements are implemented by MSI custom actions, |
| 9 which means this source implicitly declares some insofar as the Windows Inst aller sees it. | 9 which means this source implicitly declares some insofar as the Windows Inst aller sees it. |
| 10 These errors are benign and can be avoided by some fiddling with the registry on the development machine. | 10 These errors are benign and can be avoided by some fiddling with the registry on the development machine. |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 346 <ComponentRef Id="html_static_img_background.png"/> | 346 <ComponentRef Id="html_static_img_background.png"/> |
| 347 <ComponentRef Id="html_static_img_bb_disable.png"/> | 347 <ComponentRef Id="html_static_img_bb_disable.png"/> |
| 348 <ComponentRef Id="html_static_img_bb_disable_active.png"/> | 348 <ComponentRef Id="html_static_img_bb_disable_active.png"/> |
| 349 <ComponentRef Id="html_static_img_bb_donate.png"/> | 349 <ComponentRef Id="html_static_img_bb_donate.png"/> |
| 350 <ComponentRef Id="html_static_img_bb_enable.png"/> | 350 <ComponentRef Id="html_static_img_bb_enable.png"/> |
| 351 <ComponentRef Id="html_static_img_bb_enable_active.png"/> | 351 <ComponentRef Id="html_static_img_bb_enable_active.png"/> |
| 352 <ComponentRef Id="html_static_img_checkmark.png"/> | 352 <ComponentRef Id="html_static_img_checkmark.png"/> |
| 353 <ComponentRef Id="html_static_img_features_language.png"/> | 353 <ComponentRef Id="html_static_img_features_language.png"/> |
| 354 <ComponentRef Id="html_static_img_features_adblocking.png"/> | 354 <ComponentRef Id="html_static_img_features_adblocking.png"/> |
| 355 <ComponentRef Id="html_static_img_social_facebook.png"/> | 355 <ComponentRef Id="html_static_img_social_facebook.png"/> |
| 356 <ComponentRef Id="html_static_img_social_facebook_old.png"/> | |
| 357 <ComponentRef Id="html_static_img_social_gplus.png"/> | 356 <ComponentRef Id="html_static_img_social_gplus.png"/> |
| 358 <ComponentRef Id="html_static_img_social_gplus_old.png"/> | |
| 359 <ComponentRef Id="html_static_img_social_twitter.png"/> | 357 <ComponentRef Id="html_static_img_social_twitter.png"/> |
| 360 <ComponentRef Id="html_static_img_social_twitter_old.png"/> | |
| 361 <ComponentRef Id="html_static_js_firstRun.js"/> | 358 <ComponentRef Id="html_static_js_firstRun.js"/> |
| 362 <ComponentRef Id="html_static_js_IESettings.js"/> | 359 <ComponentRef Id="html_static_js_IESettings.js"/> |
| 363 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/> | 360 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/> |
| 364 <ComponentRef Id="html_static_js_ieFirstRun.js"/> | 361 <ComponentRef Id="html_static_js_ieFirstRun.js"/> |
| 365 <ComponentRef Id="html_static_js_settings.js"/> | 362 <ComponentRef Id="html_static_js_settings.js"/> |
| 366 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 363 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> |
| 367 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 364 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> |
| 368 <ComponentRef Id="html_templates_firstRun.html"/> | 365 <ComponentRef Id="html_templates_firstRun.html"/> |
| 369 <ComponentRef Id="html_templates_index.html"/> | 366 <ComponentRef Id="html_templates_index.html"/> |
| 370 </ComponentGroup> | 367 </ComponentGroup> |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 811 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> | 808 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> |
| 812 <File Name="settings.ini"/> | 809 <File Name="settings.ini"/> |
| 813 </Component> | 810 </Component> |
| 814 </Directory> | 811 </Directory> |
| 815 </DirectoryRef> | 812 </DirectoryRef> |
| 816 | 813 |
| 817 <?include ../installer-lib/custom-i18n.wxi ?> | 814 <?include ../installer-lib/custom-i18n.wxi ?> |
| 818 <?include ../custom-action/close_ie.wxi ?> | 815 <?include ../custom-action/close_ie.wxi ?> |
| 819 </Product> | 816 </Product> |
| 820 </Wix> | 817 </Wix> |
| LEFT | RIGHT |
« installer/src/custom-action/test/test-close-application.wxs ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
