@@ -107,6 +107,7 @@ Item {
107107 return maximum;
108108 }
109109 enabled: menuData && menuData.sensitive || false
110+ highlightWhenPressed: false
110111
111112 onMenuModelChanged: {
112113 loadAttributes();
@@ -146,6 +147,7 @@ Item {
146147
147148 buttonText: menuData && menuData.label || ""
148149 enabled: menuData && menuData.sensitive || false
150+ highlightWhenPressed: false
149151
150152 onTriggered: {
151153 menuModel.activate(menuIndex);
@@ -207,6 +209,7 @@ Item {
207209 iconSource: menuData && menuData.icon || ""
208210 value : menuData && menuData.actionState || 0.0
209211 enabled: menuData && menuData.sensitive || false
212+ highlightWhenPressed: false
210213 }
211214 }
212215
@@ -221,6 +224,7 @@ Item {
221224 text: menuData && menuData.label || ""
222225 iconSource: menuData && menuData.icon || ""
223226 enabled: menuData && menuData.sensitive || false
227+ highlightWhenPressed: false
224228
225229 onTriggered: {
226230 menuModel.activate(menuIndex);
@@ -228,7 +232,7 @@ Item {
228232
229233 // FIXME : At the moment, the indicators aren't using
230234 // com.canonical.indicators.link for settings menu. Need to fudge it.
231− property bool settingsMenu: menuData.action.indexOf("settings") > -1
235+ property bool settingsMenu: menuData && menuData.action.indexOf("settings") > -1 || false
232236 backColor: settingsMenu ? Qt.rgba(1,1,1,0.07) : "transparent"
233237 component: settingsMenu ? buttonForSettings : undefined
234238 Component {
@@ -254,6 +258,7 @@ Item {
254258 text: menuData && menuData.label || ""
255259 iconSource: menuData && menuData.icon || ""
256260 enabled: menuData && menuData.sensitive || false
261+ highlightWhenPressed: false
257262
258263 onTriggered: {
259264 menuModel.activate(menuIndex);
@@ -285,6 +290,7 @@ Item {
285290 text: menuData && menuData.label || ""
286291 enabled: menuData && menuData.sensitive || false
287292 checked: menuData && menuData.isToggled || false
293+ highlightWhenPressed: false
288294
289295 onTriggered: {
290296 menuModel.activate(menuIndex);
@@ -304,6 +310,7 @@ Item {
304310 iconSource: menuData && menuData.icon || ""
305311 enabled: menuData && menuData.sensitive || false
306312 checked: menuData && menuData.isToggled || false
313+ highlightWhenPressed: false
307314
308315 onTriggered: {
309316 menuModel.activate(menuIndex);
@@ -330,6 +337,7 @@ Item {
330337 iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
331338 time: timeFormatter.timeString
332339 enabled: menuData && menuData.sensitive || false
340+ highlightWhenPressed: false
333341
334342 onMenuModelChanged: {
335343 loadAttributes();
@@ -369,6 +377,7 @@ Item {
369377 time: timeFormatter.timeString
370378 eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))
371379 enabled: menuData && menuData.sensitive || false
380+ highlightWhenPressed: false
372381
373382 onMenuModelChanged: {
374383 loadAttributes();
@@ -438,6 +447,7 @@ Item {
438447 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
439448 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
440449 signalStrength: strengthAction.valid ? strengthAction.state : 0
450+ highlightWhenPressed: false
441451
442452 onMenuModelChanged: {
443453 loadAttributes();
@@ -466,6 +476,7 @@ Item {
466476 property var menuModel: menuFactory.menuModel
467477 property int menuIndex: -1
468478 property var extendedData: menuData && menuData.ext || undefined
479+ highlightWhenPressed: false
469480
470481 property var statusLabelAction: UnityMenuAction {
471482 model: menuModel
@@ -554,6 +565,7 @@ Item {
554565 iconSource: getExtendedProperty(extendedData, "icon", "image://theme/message")
555566 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
556567 enabled: menuData && menuData.sensitive || false
568+ highlightWhenPressed: false
557569 removable: true
558570
559571 onMenuModelChanged: {
@@ -596,6 +608,7 @@ Item {
596608 running: getExtendedProperty(actionState, "running", false)
597609 state: getExtendedProperty(actionState, "state", "")
598610 enabled: menuData && menuData.sensitive || false
611+ highlightWhenPressed: false
599612 showDivider: false
600613
601614 onTriggered: {
@@ -635,6 +648,7 @@ Item {
635648 canGoNext: nextAction.valid
636649 canGoPrevious: previousAction.valid
637650 enabled: menuData && menuData.sensitive || false
651+ highlightWhenPressed: false
638652
639653 onPlay: {
640654 playAction.activate();
@@ -677,6 +691,7 @@ Item {
677691 iconSource: menuData && menuData.icon || "image://theme/transfer-none"
678692 maximum: 1.0
679693 enabled: menuData && menuData.sensitive || false
694+ highlightWhenPressed: false
680695 removable: true
681696 confirmRemoval: true
682697
@@ -781,6 +796,7 @@ Item {
781796
782797 iconSource: menuData && menuData.icon || ""
783798 enabled: menuData && menuData.sensitive || false
799+ highlightWhenPressed: false
784800 text: menuData && menuData.label || ""
785801 foregroundColor: Theme.palette.normal.backgroundText
786802