@@ -62,8 +62,7 @@ LocalComponents.Page {
6262
6363 function getAccessPointName() {
6464 // 0 is the interface
65− if (currentNetworkMode === NetworkInfo.WlanMode &&
66− networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
65+ if (currentNetworkMode === NetworkInfo.WlanMode && networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
6766 accessPointName = networkName(NetworkInfo.WlanMode, 0);
6867 else
6968 accessPointName = "";
@@ -87,7 +86,6 @@ LocalComponents.Page {
8786 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
8887 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
8988 readonly property bool enterprise: getExtendedProperty(extendedData, "xCanonicalWifiApIsEnterprise", false)
90− readonly property bool isAccessPoint: menuData.type === "unity.widgets.systemsettings.tablet.accesspoint"
9189 property int signalStrength: strengthAction.valid ? strengthAction.state : 0
9290 property int menuIndex: -1
9391
@@ -102,9 +100,7 @@ LocalComponents.Page {
102100 signal activate()
103101
104102 text: menuData && menuData.label || ""
105− enabled: menuData && menuData.sensitive || false
106− height: isAccessPoint && !enterprise ? units.gu(6) : 0
107− visible: !enterprise
103+ enabled: menuData && menuData.sensitive && !enterprise || false
108104 __foregroundColor: "#525252"
109105 showDivider: true
110106 iconName: {
@@ -170,6 +166,7 @@ LocalComponents.Page {
170166
171167 readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
172168
169+ height: isAccessPoint ? units.gu(6) : 0
173170 anchors.left: parent.left
174171 anchors.right: parent.right
175172 asynchronous: true