diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-04-19 18:04:03 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-04-28 19:01:36 +0000 |
| commit | fc5767418cae4004d9286944d464b69e3f23420a (patch) | |
| tree | 96b85595fef764a0382813d972989d35ad92a4c2 | |
| parent | c954b1cefca7a34e06c71bcf59a2a0ee75f7cb1d (diff) | |
| download | wireshark-fc5767418cae4004d9286944d464b69e3f23420a.tar.gz | |
Register Wireshark as the reader of mplog files on freedesktop, OS X, and Windows.
(Doing this for freedesktop.org-compliant systems requires adding a MIME type;
yes, I just made the application/x-micropross-mplog MIME type up.)
Change-Id: I11d8cc22571dd39984f8237d0ef995922bdfd15f
Reviewed-on: https://code.wireshark.org/review/15012
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
| -rw-r--r-- | packaging/macosx/Info.plist.in | 12 | ||||
| -rw-r--r-- | packaging/nsis/AdditionalTasksPage.ini | 2 | ||||
| -rwxr-xr-x | packaging/nsis/common.nsh | 1 | ||||
| -rw-r--r-- | wireshark-mime-package.xml | 10 | ||||
| -rw-r--r-- | wireshark.desktop | 2 |
5 files changed, 25 insertions, 2 deletions
diff --git a/packaging/macosx/Info.plist.in b/packaging/macosx/Info.plist.in index e19ed110d0..f044c48ba0 100644 --- a/packaging/macosx/Info.plist.in +++ b/packaging/macosx/Info.plist.in @@ -47,6 +47,18 @@ <key>CFBundleTypeRole</key> <string>Viewer</string> </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>mplog</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>Wiresharkdoc.icns</string> + <key>CFBundleTypeName</key> + <string>Micropross mplog capture</string> + <key>CFBundleTypeRole</key> + <string>Viewer</string> + </dict> <!-- XXX - This dictionary needs a lot more entries --> </array> <key>CFBundleInfoDictionaryVersion</key> diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini index fabef34c07..34ac014ef4 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, out, pcap, +Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, mplog, out, pcap, [Field 13] Type=Label diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index d87d2009fd..d84434141e 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -118,6 +118,7 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".apc" Push ".acp" Push ".5vw" + Push ".mplog" !macroend !macro IsWiresharkRunning diff --git a/wireshark-mime-package.xml b/wireshark-mime-package.xml index 7493bddd70..41e0b58f66 100644 --- a/wireshark-mime-package.xml +++ b/wireshark-mime-package.xml @@ -163,4 +163,14 @@ <glob pattern="*.rf5"/> <glob pattern="*.rf5.gz"/> </mime-type> + + <mime-type type="application/x-micropross-mplog"> + <comment>Packet Capture (mplog)</comment> + <generic-icon name="application-wireshark-doc"/> + <magic> + <match type="string" offset="0" value="MPCSII"/> + </magic> + <glob pattern="*.mplog"/> + <glob pattern="*.mplog.gz"/> + </mime-type> </mime-info> diff --git a/wireshark.desktop b/wireshark.desktop index e985f98cba..c073f63481 100644 --- a/wireshark.desktop +++ b/wireshark.desktop @@ -105,7 +105,7 @@ Icon=wireshark TryExec=wireshark Exec=wireshark %f Terminal=false -MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5; +MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog; # Category entry according to: # http://standards.freedesktop.org/menu-spec/1.0/ Categories=Network;Monitor;Qt; |