Merge lp:~laney/indicator-network/lp1632275 into lp:indicator-network

[Iain Lane]

data/indicator-network-secret-agent.conf.in: Only start on Unity 8. We only start the indicator there; do the same for the secret-agent too. This works around a crash on i386 (by not running the code) - the crash is still pending investigation.

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'data/indicator-network-secret-agent.conf.in'
--- data/indicator-network-secret-agent.conf.in	2015-11-20 13:14:50 +0000
+++ data/indicator-network-secret-agent.conf.in	2016-10-11 15:08:58 +0000
@@ -5,4 +5,15 @@
 
 respawn
 
+pre-start script
+	# NOTE: Only used on Unity8 today, not 7
+	#       Still allows manual starting
+	if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] &&
+	   [ "x$DESKTOP_SESSION" != "xunity8" ]; then
+		if [ "x$UPSTART_EVENTS" != "x" ] ; then
+			stop; exit 0
+		fi
+	fi
+end script
+
 exec @AGENT_SERVICE@