unity8-desktop-session

Merge lp:~bregma/unity8-desktop-session/lp-1300921 into lp:unity8-desktop-session

  1. lp-1300921
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 45
Proposed branch: lp:~bregma/unity8-desktop-session/lp-1300921
Merge into: lp:unity8-desktop-session
Diff against target: 16 lines (+5/-1)
1 file modified
data/unity8-mir.conf.in (+5/-1)
To merge this branch: bzr merge lp:~bregma/unity8-desktop-session/lp-1300921
Reviewer Review Type Date Requested Status
Unity 8 Desktop Session Pending
Review via email: mp+213912@code.launchpad.net

Commit message

propagate the QT_QPA_PLATFORM to session services started through D-Bus

Description of the change

Propagate the QT_QPA_PLATFORM to session services started through D-Bus.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

I think you should be able to add both variables in a single D-Bus call:

gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
  --method org.freedesktop.DBus.UpdateActivationEnvironment \
  "@a{ss} {'QT_QPA_PLATFORM': 'ubuntumirclient', 'MIR_SOCKET': '$MIR_SERVER_FILE'}"

lp:~bregma/unity8-desktop-session/lp-1300921 updated
46. By Stephen M. Webb

consolidate D-Bus env push command

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/unity8-mir.conf.in'
2--- data/unity8-mir.conf.in 2014-03-28 17:09:40 +0000
3+++ data/unity8-mir.conf.in 2014-04-02 20:27:31 +0000
4@@ -35,7 +35,11 @@
5 initctl set-env --global QML2_IMPORT_PATH=@LIB_DIR@/qt5/imports/Unity-Mir
6 initctl set-env --global UNITY_INDICATOR_PROFILE=desktop
7
8- gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
9+ gdbus call --session \
10+ --dest org.freedesktop.DBus \
11+ --object-path /org/freedesktop/DBus \
12+ --method org.freedesktop.DBus.UpdateActivationEnvironment \
13+ "@a{ss} {'QT_QPA_PLATFORM': 'ubuntumirclient', 'MIR_SOCKET': '$MIR_SERVER_FILE'}"
14 fi
15
16 if [ -z "$UNITY_SCOPES_LIST" ]; then

Subscribers

People subscribed via source and target branches