-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVxNW6AAoJEBu5sftaTG2tsW4P/RZIU57IDSlLZmLKKCgouQMR
 TE1KrgTexaPuzagcZ0rf8op1gXqyt8EBY8mQkOHh/TmF+r0JLsSuddCNAVxkm0fw
 MKJKFviAr6CZbA8nvRRiJEKIdmHV8TyLvPrXMr0CIXkx+pV24b5LUpPx8EmQMk4J
 k+ljGX6uPMIAdgXRvjnRk1BJMuAJEi98iKBAupqyNTmj4409x3xNCEsBTJcu174Z
 sznoK4eqyxGVK9GQRDin9swVp1anIZ8ppRtmIyNTac1zYFctALenWa4xMZlOjFOW
 UGou5ToQRrN3MLuRrJYqM3ZOahH9EO4APd1dd3azuwXzVDHLkZTsLrgRI+XB0T09
 5YGOM60Tjd8lArm8r4e3TwGPJJYeH/t7JtOCSdk78sD2a3sh0+jyRshan/XxqpJp
 xHe43cpe2k4eJ5aezi5S6CapbwdoO8pOE6bg2AoDqCLwKd5YHSGxmVP2TuRYkYvV
 QPOlgfJMF/sCdWBT5YqM/vQTsHaZzmKfN/1sRLj2Tbpchw+sM4mRXTy4LBLhY7Ln
 HmVHFRTQqWuvwvj1BJ/iFZHXE1zYhp4Cl0ABSdRT5dEd88YN3hJFJ9zpehntKvLJ
 R73PQnFafm3mBALxckaAeIR7cNGuuWhBMYP+GwE2tgUmk/SuG9vogccXkBAlYAJd
 vQBQcMF/45EWTs2s1/gY
 =H2wk
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJVxUXQAAoJEAY5OLpCz6ckKHYP/2dvWgWMahZ1mlWtV0fgFYgQ
 wtSUza1XxhSPpHwI+mjt+OqQz8nZWhxkobrGYwUXBGryV6rBvt+Wdw5N+rWE/J5Q
 PNPZiWkrMHAgHpui+T0KtiSVJkePeOtiUbW/8zPQH2J/5oDae6P8a7jts5VIjp72
 TWwlAFgxxMTRUOjZ6Fkcj55A4/kJcVPhvEypZoReFW34eRWGbPYMws54iAy5BN3k
 eDPUplY9ICRHGBezqSA0lxZfYG0QgseVoPnbnxhtOlqfHGghH5pTXdYO0iX6jTG+
 Grzfeczno7hKgsHVNxtT3EdR86vtqrUByGjf44T+HXAUJvdr0iTrK4dIkvDoOk0M
 pn5eHLcHvLK6MKKyY5gkfGRminQgLfakQSukgbP9d/Sp+bBo6G1B1bmcPXeufNi2
 2XUzQDliWFJrdCP7FTvQxKZZI3mwi2vdu4gWMfz/mPwR/stue2RrCDfQZMXfCBVr
 wPmdPY4tuF6Fw/cP96/y24kCtCB13UPSSm5E3CJ/wtu2iItHHKP6oBjIXec39Vtk
 QWe2zluC+b6Tgt4YrlsHnSfAsVE5pW1WWzAq3DxDhuu7OOlU7WdLasAb5OglEVWQ
 TzWM6b/sanBb9FPI/s0VZqF6/Zzy4UcO9+esxA6YgapfJ7pYTzYs8dDFvX2ABpQz
 dHn6Vj3UDycL/WTxel9m
 =TS2/
 -----END PGP SIGNATURE-----

Merge tag 'jm_a5ee90b4'

Tag for commit a5ee90b420

* tag 'jm_a5ee90b4':
  qubes-desktop-run: Activate via DBUS when desktop file contains DBusActivatable

Fixes qubesos/qubes-issues#1031
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-08 01:56:22 +02:00
commit e2cb9b9d74

View File

@ -1,11 +1,36 @@
#!/usr/bin/python
#! /usr/bin/env python
# -*- coding: utf-8 -*-
# vim: set ft=python ts=4 sw=4 sts=4 et :
import sys
import subprocess
from gi.repository import Gio
import sys
def main(myname, desktop, *files):
launcher = Gio.DesktopAppInfo.new_from_filename(desktop)
launcher.launch(files, None)
info = Gio.DesktopAppInfo()
dbus_activate = False
try:
launcher = info.new_from_filename(desktop)
except TypeError:
launcher = None
if launcher:
try:
dbus_activate = launcher.get_boolean('DBusActivatable')
except AttributeError:
dbus_activate = False
if not dbus_activate:
launcher.launch(files, None)
else:
if dbus_activate:
cmd = ['gapplication', 'launch', launcher.get_id().replace('.desktop', '')]
if files:
cmd.extend(files)
process = subprocess.Popen(cmd, close_fds=True)
if __name__ == "__main__":
main(*sys.argv)