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

[Stephen M. Webb]

propagate the QT_QPA_PLATFORM to session services started through D-Bus

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

[Alberto Mardegan (mardy)]

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]

46. By Stephen M. Webb on 2014-04-02

consolidate D-Bus env push command

=== modified file 'data/unity8-mir.conf.in'
--- data/unity8-mir.conf.in	2014-03-28 17:09:40 +0000
+++ data/unity8-mir.conf.in	2014-04-02 20:27:31 +0000
@@ -35,7 +35,11 @@
         initctl set-env --global QML2_IMPORT_PATH=@LIB_DIR@/qt5/imports/Unity-Mir
         initctl set-env --global UNITY_INDICATOR_PROFILE=desktop
 
-        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
+        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'}"
     fi
 
     if [ -z "$UNITY_SCOPES_LIST" ]; then