@@ -197,11 +197,15 @@ Item {
197197 objectName: "checkableMenu"
198198 property QtObject menuData: null
199199 property int menuIndex: -1
200+ property bool serverChecked: menuData && menuData.isToggled || false
200201
201202 text: menuData && menuData.label || ""
202203 enabled: menuData && menuData.sensitive || false
203− checked: menuData && menuData.isToggled || false
204204
205+ onServerCheckedChanged: {
206+ // value can be changed by menu, so a binding won't work.
207+ checked = serverChecked;
208+ }
205209 onTriggered: {
206210 menuModel.activate(menuIndex);
207211 }
@@ -216,12 +220,16 @@ Item {
216220 objectName: "switchMenu"
217221 property QtObject menuData: null
218222 property int menuIndex: -1
223+ property bool serverChecked: menuData && menuData.isToggled || false
219224
220225 text: menuData && menuData.label || ""
221226 iconSource: menuData && menuData.icon || ""
222227 enabled: menuData && menuData.sensitive || false
223− checked: menuData && menuData.isToggled || false
224228
229+ onServerCheckedChanged: {
230+ // value can be changed by menu, so a binding won't work.
231+ checked = serverChecked;
232+ }
225233 onTriggered: {
226234 menuModel.activate(menuIndex);
227235 }
@@ -342,6 +350,7 @@ Item {
342350 property var menuModel: menuFactory.menuModel
343351 property int menuIndex: -1
344352 property var extendedData: menuData && menuData.ext || undefined
353+ property bool serverChecked: menuData && menuData.isToggled || false
345354
346355 property var strengthAction: UnityMenuAction {
347356 model: menuModel
@@ -351,11 +360,14 @@ Item {
351360
352361 text: menuData && menuData.label || ""
353362 enabled: menuData && menuData.sensitive || false
354− checked: menuData && menuData.isToggled || false
355363 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
356364 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
357365 signalStrength: strengthAction.valid ? strengthAction.state : 0
358366
367+ onServerCheckedChanged: {
368+ // value can be changed by menu, so a binding won't work.
369+ checked = serverChecked;
370+ }
359371 onMenuModelChanged: {
360372 loadAttributes();
361373 }