Network Menu

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

  1. lp1632275
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Iain Lane
Approved revision: 634
Merged at revision: 634
Proposed branch: lp:~laney/indicator-network/lp1632275
Merge into: lp:indicator-network
Diff against target: 19 lines (+11/-0)
1 file modified
data/indicator-network-secret-agent.conf.in (+11/-0)
To merge this branch: bzr merge lp:~laney/indicator-network/lp1632275
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
Indicator Applet Developers Pending
Review via email: mp+308134@code.launchpad.net

Commit message

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.

To post a comment you must log in.
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-network-secret-agent.conf.in'
2--- data/indicator-network-secret-agent.conf.in 2015-11-20 13:14:50 +0000
3+++ data/indicator-network-secret-agent.conf.in 2016-10-11 15:08:58 +0000
4@@ -5,4 +5,15 @@
5
6 respawn
7
8+pre-start script
9+ # NOTE: Only used on Unity8 today, not 7
10+ # Still allows manual starting
11+ if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] &&
12+ [ "x$DESKTOP_SESSION" != "xunity8" ]; then
13+ if [ "x$UPSTART_EVENTS" != "x" ] ; then
14+ stop; exit 0
15+ fi
16+ fi
17+end script
18+
19 exec @AGENT_SERVICE@

Subscribers

People subscribed via source and target branches