xiwrap

commit

48a17612c431632d44d401dd0950d5da168fc6a1

parent

423f5a3f1c647dc9dee7f67787a1da007963a618

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2024-06-21 10:13

API: no session prefix for dbus

similar to flatpak

Diffstat

3 files changed, 7 insertions, 13 deletions

diff --git a/includes/gui b/includes/gui

@@ -17,7 +17,7 @@ ro-bind-try $XDG_DATA_HOME/themes
   17    17 bind-try $XDG_CACHE_HOME/fontconfig
   18    18 bind-try $XDG_CACHE_HOME/thumbnails
   19    19 
   20    -1 dbus-session-talk org.a11y.Bus
   -1    20 dbus-talk org.a11y.Bus
   21    21 
   22    22 setenv GTK_USE_PORTAL 1
   23    23 include portal

diff --git a/includes/portal b/includes/portal

@@ -1,2 +1,2 @@
    1    -1 dbus-session-talk org.freedesktop.portal.Desktop
    2    -1 dbus-session-talk org.freedesktop.portal.Documents
   -1     1 dbus-talk org.freedesktop.portal.Desktop
   -1     2 dbus-talk org.freedesktop.portal.Documents

diff --git a/xiwrap.py b/xiwrap.py

@@ -28,8 +28,8 @@ The following options are available:
   28    28 --tmpfs DEST            Mount new tmpfs on DEST.
   29    29 --mqueue DEST           Mount new mqueue on DEST.
   30    30 --dir DEST              Create a directory at DEST.
   31    -1 --dbus-session-see NAME, --dbus-session-talk NAME, --dbus-session-own NAME,
   32    -1 --dbus-session-call NAME=RULE, --dbus-session-broadcast NAME=RULE,
   -1    31 --dbus-see NAME, --dbus-talk NAME, --dbus-own NAME,
   -1    32 --dbus-call NAME=RULE, --dbus-broadcast NAME=RULE,
   33    33 --dbus-system-see NAME, --dbus-system-talk NAME, --dbus-system-own NAME,
   34    34 --dbus-system-call NAME=RULE, --dbus-system-broadcast NAME=RULE
   35    35                         Allow filtered access to dbus. See `man xdg-dbus-proxy`
@@ -150,18 +150,12 @@ class RuleSet:
  150   150             if len(args) != 0:
  151   151                 raise RuleError(key, args)
  152   152             self.share[key] = True
  153    -1         elif key in [
  154    -1             'dbus-session-see',
  155    -1             'dbus-session-talk',
  156    -1             'dbus-session-own',
  157    -1             'dbus-session-call',
  158    -1             'dbus-session-broadcast',
  159    -1         ]:
   -1   153         elif key in ['dbus-see', 'dbus-talk', 'dbus-own', 'dbus-call', 'dbus-broadcast']:
  160   154             if len(args) != 1:
  161   155                 raise RuleError(key, args)
  162   156             self.ensure_sync_fds()
  163   157             self.push_rule('ro-bind', [DBUS_SESSION_SRC, DBUS_SESSION_DEST], cwd=None)
  164    -1             self.dbus_session[args[0]] = key.removeprefix('dbus-session-')
   -1   158             self.dbus_session[args[0]] = key.removeprefix('dbus-')
  165   159         elif key in [
  166   160             'dbus-system-see',
  167   161             'dbus-system-talk',