diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-05-30 21:45:18 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-01 04:30:19 +0000 |
| commit | 162edec9ad00ec04cb5927482ba1620a354f2037 (patch) | |
| tree | 2ddd31f8551550e613e3e6eb93805308b22e74e2 /packaging/nsis | |
| parent | 16c91568bb4daf63e536c5b1101f3530c177f21f (diff) | |
| download | wireshark-162edec9ad00ec04cb5927482ba1620a354f2037.tar.gz | |
Register a few more file extensions as belonging to Wireshark.
Register Wireshark for PacketLogger, ERF, IPFIX, and VWR files on
freedesktop.org, OS X, and Windows (we were already registered for ERF and VWR
files on Windows).
Change-Id: I8105997cb15ea06e1c078489fd88763d4ce9e40c
Reviewed-on: https://code.wireshark.org/review/15635
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/AdditionalTasksPage.ini | 4 | ||||
| -rwxr-xr-x | packaging/nsis/common.nsh | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini index 34ac014ef4..29e45db352 100644 --- a/packaging/nsis/AdditionalTasksPage.ini +++ b/packaging/nsis/AdditionalTasksPage.ini @@ -113,7 +113,7 @@ Left=10 Right=280 Top=120 Bottom=128 -Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, mplog, out, pcap, +Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, mplog, out, pcap, [Field 13] Type=Label @@ -121,5 +121,5 @@ Left=10 Right=280 Top=130 Bottom=138 -Text=pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz +Text=pcapng, pfx, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index d84434141e..3645022b26 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -105,10 +105,14 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".snoop" Push ".rf5" Push ".pkt" + Push ".pklg" + Push ".pfx" Push ".pcapng" Push ".pcap" Push ".out" Push ".ntar" + Push ".mplog" + Push ".ipfix" Push ".fdc" Push ".erf" Push ".enc" @@ -118,7 +122,6 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".apc" Push ".acp" Push ".5vw" - Push ".mplog" !macroend !macro IsWiresharkRunning |