@@ -50,7 +50,7 @@ Item {
5050 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
5151 }
5252
53− function getProperty(object, propertyName, defaultValue) {
53+ function getExtendedProperty(object, propertyName, defaultValue) {
5454 if (object && object.hasOwnProperty(propertyName)) {
5555 return object[propertyName];
5656 }
@@ -65,23 +65,23 @@ Item {
6565 property QtObject menuData: null
6666 property var menuModel: menuFactory.menuModel
6767 property var menuIndex: undefined
68− property var extendedData: getProperty(menuData, "ext", undefined)
68+ property var extendedData: menuData && menuData.ext || undefined
6969
70− text: getProperty(menuData, "label", "")
71− icon: getProperty(menuData, "icon", "")
72− minIcon: getProperty(extendedData, "minIcon", "")
73− maxIcon: getProperty(extendedData, "minIcon", "")
70+ text: menuData && menuData.label || ""
71+ iconSource: menuData && menuData.icon || ""
72+ minIcon: getExtendedProperty(extendedData, "minIcon", "")
73+ maxIcon: getExtendedProperty(extendedData, "minIcon", "")
7474
75− minimumValue: getProperty(extendedData, "minValue", 0.0)
75+ minimumValue: getExtendedProperty(extendedData, "minValue", 0.0)
7676 maximumValue: {
77− var maximum = getProperty(extendedData, "maxValue", 1.0);
77+ var maximum = getExtendedProperty(extendedData, "maxValue", 1.0);
7878 if (maximum <= minimumValue) {
7979 return minimumValue + 1;
8080 }
8181 return maximum;
8282 }
83− value: getProperty(menuData, "actionState", 0.0)
84− enabled: getProperty(menuData, "sensitive", false)
83+ value: menuData && menuData.actionState || 0.0
84+ enabled: menuData && menuData.sensitive || false
8585
8686 onMenuModelChanged: {
8787 loadAttributes();
@@ -110,8 +110,8 @@ Item {
110110 property var menuModel: menuFactory.menuModel
111111 property var menuIndex: undefined
112112
113− text: getProperty(menuData, "label", "")
114− enabled: getProperty(menuData, "sensitive", false)
113+ text: menuData && menuData.label || ""
114+ enabled: menuData && menuData.sensitive || false
115115
116116 onActivate: {
117117 menuModel.activate(menuIndex);
@@ -125,7 +125,7 @@ Item {
125125 property QtObject menuData: null
126126 property var menuIndex: undefined
127127
128− text: getProperty(menuData, "label", "")
128+ text: menuData && menuData.label || ""
129129 }
130130 }
131131
@@ -135,10 +135,10 @@ Item {
135135 property QtObject menuData: null
136136 property var menuIndex: undefined
137137
138− text: getProperty(menuData, "label", "")
139− icon: getProperty(menuData, "icon", "")
140− value : getProperty(menuData, "actionState", 0.0)
141− enabled: getProperty(menuData, "sensitive", false)
138+ text: menuData && menuData.label || ""
139+ iconSource: menuData && menuData.icon || ""
140+ value : menuData && menuData.actionState || 0.0
141+ enabled: menuData && menuData.sensitive || false
142142 }
143143 }
144144
@@ -148,9 +148,9 @@ Item {
148148 property QtObject menuData: null
149149 property var menuIndex: undefined
150150
151− text: getProperty(menuData, "label", "")
152− icon: getProperty(menuData, "icon", "")
153− enabled: getProperty(menuData, "sensitive", false)
151+ text: menuData && menuData.label || ""
152+ iconSource: menuData && menuData.icon || ""
153+ enabled: menuData && menuData.sensitive || false
154154 checkable: menuData ? (menuData.isCheck || menuData.isRadio) : false
155155 checked: checkable ? menuData.isToggled : false
156156
@@ -167,9 +167,9 @@ Item {
167167 property QtObject menuData: null
168168 property var menuIndex: undefined
169169
170− text: getProperty(menuData, "label", "")
171− icon: getProperty(menuData, "icon", "")
172− enabled: getProperty(menuData, "sensitive", false)
170+ text: menuData && menuData.label || ""
171+ iconSource: menuData && menuData.icon || ""
172+ enabled: menuData && menuData.sensitive || false
173173 checked: menuData ? menuData.isToggled : false
174174
175175 onActivate: {
@@ -185,10 +185,10 @@ Item {
185185 property QtObject menuData: null
186186 property var menuModel: menuFactory.menuModel
187187 property var menuIndex: undefined
188− property var extendedData: getProperty(menuData, "ext", undefined)
188+ property var extendedData: menuData && menuData.ext || undefined
189189
190− text: getProperty(menuData, "label", "")
191− busy: getProperty(extendedData, "xCanonicalBusyAction", false)
190+ text: menuData && menuData.label || ""
191+ busy: getExtendedProperty(extendedData, "xCanonicalBusyAction", false)
192192
193193 onMenuModelChanged: {
194194 loadAttributes();
@@ -210,18 +210,18 @@ Item {
210210 property QtObject menuData: null
211211 property var menuModel: menuFactory.menuModel
212212 property var menuIndex: undefined
213− property var extendedData: getProperty(menuData, "ext", undefined)
213+ property var extendedData: menuData && menuData.ext || undefined
214214
215215 property var strengthAction: QMenuModel.UnityMenuAction {
216216 model: menuModel
217217 index: menuIndex
218− name: getProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
218+ name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
219219 }
220220
221− text: getProperty(menuData, "label", "")
222− enabled: getProperty(menuData, "sensitive", false)
223− secure: getProperty(extendedData, "xCanonicalWifiApIsSecure", false)
224− adHoc: getProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
221+ text: menuData && menuData.label || ""
222+ enabled: menuData && menuData.sensitive || false
223+ secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
224+ adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
225225 checked: menuData ? menuData.isToggled : false
226226 signalStrength: strengthAction.valid ? strengthAction.state : 0
227227
@@ -258,10 +258,10 @@ Item {
258258 property QtObject menuData: null
259259 property var menuModel: menuFactory.menuModel
260260 property var menuIndex: undefined
261− property var extendedData: getProperty(menuData, "ext", undefined)
261+ property var extendedData: menuData && menuData.ext || undefined
262262
263− title: getProperty(menuData, "label", "")
264− appIcon: getProperty(extendedData, "icon", "") && extendedData.hasOwnProperty("qrc:/indicators/artwork/messaging/default_app.svg")
263+ title: menuData && menuData.label || ""
264+ appIcon: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
265265 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
266266
267267 onMenuModelChanged: {