From 0c2306dd0a4e5d5487cc36e04feb350286d90966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 26 Aug 2015 02:00:51 +0200 Subject: [PATCH] Revert "qubes-desktop-run: Activate via DBUS when desktop file contains DBusActivatable" This reverts commit a5ee90b4203d9a7719c2aa3490be51848648648e. Lets start the Dbus service the proper way. --- misc/qubes-desktop-run | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/misc/qubes-desktop-run b/misc/qubes-desktop-run index a164792..14e3f8b 100755 --- a/misc/qubes-desktop-run +++ b/misc/qubes-desktop-run @@ -1,36 +1,11 @@ -#! /usr/bin/env python -# -*- coding: utf-8 -*- -# vim: set ft=python ts=4 sw=4 sts=4 et : - -import sys -import subprocess +#!/usr/bin/python from gi.repository import Gio +import sys def main(myname, desktop, *files): - 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) + launcher = Gio.DesktopAppInfo.new_from_filename(desktop) + launcher.launch(files, None) if __name__ == "__main__": main(*sys.argv)