From fc5767418cae4004d9286944d464b69e3f23420a Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Tue, 19 Apr 2016 18:04:03 -0400
Subject: 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>
---
 packaging/macosx/Info.plist.in         | 12 ++++++++++++
 packaging/nsis/AdditionalTasksPage.ini |  2 +-
 packaging/nsis/common.nsh              |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'packaging')

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
-- 
cgit v1.2.1