Network Menu

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

  1. lp-1603453
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Antti Kaijanmäki
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) Approve
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.
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
=== modified file 'data/indicator-network.conf.in'
--- data/indicator-network.conf.in 2014-06-19 14:25:21 +0000
+++ data/indicator-network.conf.in 2016-07-15 14:57:02 +0000
@@ -13,8 +13,7 @@
13 # NOTE: Only used on Unity8 today, not 713 # NOTE: Only used on Unity8 today, not 7
14 # Still allows manual starting14 # Still allows manual starting
15 if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] && 15 if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] &&
16 [ "x$DESKTOP_SESSION" != "xunity8-mir" ] && 16 [ "x$DESKTOP_SESSION" != "xunity8" ]; then
17 [ "x$DESKTOP_SESSION" != "xunity8-x11" ]; then
18 if [ "x$UPSTART_EVENTS" != "x" ] ; then17 if [ "x$UPSTART_EVENTS" != "x" ] ; then
19 stop; exit 018 stop; exit 0
20 fi19 fi

Subscribers

People subscribed via source and target branches