#880: add xpraconfig mimetype

git-svn-id: https://xpra.org/svn/Xpra/trunk@9571 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jun 2, 2015 · 6866d6b · 6866d6b
1 parent b642f27
commit 6866d6b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/debian/xpra.install b/debian/xpra.install
@@ -2,6 +2,7 @@ usr/lib/*/*/xpra
 usr/bin/xpra
 usr/bin/xpra_launcher
 usr/share/applications/xpra_launcher.desktop
+usr/share/mime/packages/application-x-xpraconfig.xml
 usr/share/xpra/icons/*.png
 usr/share/xpra/www/*
 etc/xpra/xorg.conf

diff --git a/rpmbuild/xpra.spec b/rpmbuild/xpra.spec
@@ -249,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/xpra*
 %{_datadir}/applications/xpra_launcher.desktop
 %{_datadir}/applications/xpra.desktop
+%{_datadir}/mime/packages/application-x-xpraconfig.xml
 %{_datadir}/appdata/xpra.appdata.xml
 %{_datadir}/icons/xpra.png
 /usr/lib/cups/backend/xpraforwarder
@@ -285,12 +286,14 @@ popd
 
 
 %post
+/usr/bin/update-mime-database &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /bin/chmod 700 /usr/lib/cups/backend/xpraforwarder
 
 
 %postun
+/usr/bin/update-mime-database &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null

diff --git a/src/setup.py b/src/setup.py
@@ -1552,6 +1552,7 @@ def add_keywords(path_dirs=[], inc_dirs=[], lib_dirs=[], libs=[], noref=True, no
     add_data_files("share/xpra",          ["README", "COPYING"])
     add_data_files("share/xpra/icons",    glob.glob("icons/*"))
     add_data_files("share/applications",  ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"])
+    add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"])
     add_data_files("share/icons",         ["xdg/xpra.png"])
     add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
     html5_dir = "share/xpra/www"

diff --git a/src/xdg/application-x-xpraconfig.xml b/src/xdg/application-x-xpraconfig.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-xpraconfig">
+    <comment>Xpra Session File</comment>
+    <glob pattern="*.xpra"/>
+  </mime-type>
+</mime-info>
diff --git a/src/xdg/xpra_launcher.desktop b/src/xdg/xpra_launcher.desktop
@@ -2,10 +2,10 @@
 Name=Xpra Launcher
 Comment=Connect to an Xpra session
 TryExec=xpra_launcher
-Exec=xpra_launcher
+Exec=xpra_launcher %f
 Icon=xpra
 Terminal=false
 Type=Application
 StartupNotify=false
 Categories=Network;
-MimeType=text/x-xpraconfig;
+MimeType=application/x-xpraconfig;