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

[Stephen M. Webb]

emit scope-ui-starting signal on start for new scope model

Emits the appropriate upstart signal on startup so the new click scopes will work.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'data/unity8-mir.conf.in'
--- data/unity8-mir.conf.in	2014-02-05 23:29:17 +0000
+++ data/unity8-mir.conf.in	2014-03-28 17:19:24 +0000
@@ -1,5 +1,7 @@
 description "Unity Shell v8 on Mir"
 
+emits scope-ui-starting
+
 start on xsession SESSION=unity8-mir and started dbus
 stop on desktop-end
 
@@ -31,7 +33,19 @@
         initctl set-env --global UBUNTU_PLATFORM_API_BACKEND=libubuntu_application_api_test.so.1
         initctl set-env --global UBUNTU_PLATFORM_API_SENSOR_TEST=@PKGDATA_DIR@/sensors.txt
         initctl set-env --global QML2_IMPORT_PATH=@LIB_DIR@/qt5/imports/Unity-Mir
-    fi
+        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'}"
+    fi
+
+    if [ -z "$UNITY_SCOPES_LIST" ]; then
+        initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
+    fi
+
+    initctl emit scope-ui-starting
 end script
 
 exec ${BINARY:-unity8} $ARGS
+
+pre-stop exec initctl emit --no-wait desktop-end
+post-stop exec dbus-send --type=method_call --address=$UPSTART_SESSION /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession