Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dbusactivation-v1'

Browse Source 
* dbusactivation-v1:
  Implement D-Bus Activation of desktop files manually
This commit is contained in:
Marek Marczykowski-Górecki 2019-04-13 04:31:04 +02:00
commit feeb4b3816
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qubesagent/xdg.py
View File

@ -1,3 +1,5 @@
import functools
from gi.repository import Gio # pylint: disable=import-error from gi.repository import Gio # pylint: disable=import-error
from gi.repository import GLib # pylint: disable=import-error from gi.repository import GLib # pylint: disable=import-error
import sys import sys
@ -6,22 +8,51 @@ import os
def pid_callback(launcher, pid, pid_list): def pid_callback(launcher, pid, pid_list):
pid_list.append(pid) pid_list.append(pid)
def dbus_name_change(loop, name, old_owner, new_owner):
if not new_owner:
loop.quit()
def launch(desktop, *files, **kwargs): def launch(desktop, *files, **kwargs):
wait = kwargs.pop('wait', True) wait = kwargs.pop('wait', True)
launcher = Gio.DesktopAppInfo.new_from_filename(desktop) launcher = Gio.DesktopAppInfo.new_from_filename(desktop)
try: try:
import dbus import dbus
from dbus.mainloop.glib import DBusGMainLoop
if hasattr(launcher, 'get_boolean'): if hasattr(launcher, 'get_boolean'):
activatable = launcher.get_boolean('DBusActivatable') activatable = launcher.get_boolean('DBusActivatable')
if activatable: if activatable:
loop = GLib.MainLoop()
DBusGMainLoop(set_as_default=True)
bus = dbus.SessionBus() bus = dbus.SessionBus()
service_id = launcher.get_id() service_id = launcher.get_id()
# cut the .desktop suffix # cut the .desktop suffix
service_id = service_id[:-8] service_id = service_id[:-len('.desktop')]
# see D-Bus Activation Desktop entry specification
object_path = '/' + service_id.replace('.', '/').\
replace('-', '_')
try: try:
bus.start_service_by_name(service_id) proxy = bus.get_object(service_id, object_path)
except dbus.DBusException: match = bus.add_signal_receiver(
functools.partial(dbus_name_change, loop),
'NameOwnerChanged',
dbus.BUS_DAEMON_IFACE,
dbus.BUS_DAEMON_NAME,
dbus.BUS_DAEMON_PATH)
if files:
proxy.Open(files, {},
dbus_interface='org.freedesktop.Application')
else:
proxy.Activate({},
dbus_interface='org.freedesktop.Application')
except dbus.DBusException as e:
print(e)
# fallback to non-dbus version
pass pass
else:
if wait:
loop.run()
match.remove()
return
except ImportError: except ImportError:
pass pass
if wait: if wait: