Merge lp:~bregma/indicator-network/lp-1603453 into lp:indicator-network

Proposed by Stephen M. Webb on 2016-07-15
Status: Merged
Approved by: Antti Kaijanmäki on 2016-07-15
Approved revision: 610
Merged at revision: 617
Proposed branch: lp:~bregma/indicator-network/lp-1603453
Merge into: lp:indicator-network
Diff against target: 13 lines (+1/-2)
1 file modified
data/indicator-network.conf.in (+1/-2)
To merge this branch: bzr merge lp:~bregma/indicator-network/lp-1603453
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) 2016-07-15 Approve on 2016-07-15
PS Jenkins bot continuous-integration Pending
Review via email: mp+300200@code.launchpad.net

Commit message

Update the DESKTOP_SESSION string used to identify a Unity 8 session on Ubuntu desktop.

Description of the change

Update the DESKTOP_SESSION string used to identify a Unity 8 session on Ubuntu desktop.

To post a comment you must log in.
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.conf.in'
2--- data/indicator-network.conf.in 2014-06-19 14:25:21 +0000
3+++ data/indicator-network.conf.in 2016-07-15 14:57:02 +0000
4@@ -13,8 +13,7 @@
5 # NOTE: Only used on Unity8 today, not 7
6 # Still allows manual starting
7 if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] &&
8- [ "x$DESKTOP_SESSION" != "xunity8-mir" ] &&
9- [ "x$DESKTOP_SESSION" != "xunity8-x11" ]; then
10+ [ "x$DESKTOP_SESSION" != "xunity8" ]; then
11 if [ "x$UPSTART_EVENTS" != "x" ] ; then
12 stop; exit 0
13 fi

Subscribers

People subscribed via source and target branches