@@ -23,50 +23,48 @@ import Ubuntu.Components 0.1
2323import Unity.Indicators 0.1 as Indicators
2424
2525Indicators.BasicMenuItem {
26− id: __messageItem
27−
2826 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
2927
3028 onActionGroupChanged: loadItem()
3129 onActionsDescriptionChanged: loadItem()
32− implicitHeight: __contents.status == Loader.Ready ? __contents.item.implicitHeight : 0
30+ implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0
3331
3432 Loader {
35− id: __contents
33+ id: contents
3634
3735 anchors.fill: parent
3836 // Binding all properties for the item, to make sure that any change in the
39− // property will be propagated to the __contents.item at any time
37+ // property will be propagated to the contents.item at any time
4038 Binding {
41− target: __contents.item
39+ target: contents.item
4240 property: "menuActivated"
4341 value: menuActivated
44− when: (__contents.status == Loader.Ready)
42+ when: (contents.status == Loader.Ready)
4543 }
4644
4745 Binding {
48− target: __contents.item
46+ target: contents.item
4947 property: "actionGroup"
5048 value: actionGroup
51− when: (__contents.status == Loader.Ready)
49+ when: (contents.status == Loader.Ready)
5250 }
5351
5452 Binding {
55− target: __contents.item
53+ target: contents.item
5654 property: "menu"
5755 value: menu
58− when: (__contents.status == Loader.Ready)
56+ when: (contents.status == Loader.Ready)
5957 }
6058
6159 Binding {
62− target: __contents.item
60+ target: contents.item
6361 property: "actionsDescription"
6462 value: actionsDescription
65− when: (__contents.status == Loader.Ready)
63+ when: (contents.status == Loader.Ready)
6664 }
6765
6866 Connections {
69− target: __contents.item ? __contents.item : null
67+ target: contents.item ? contents.item : null
7068 onActivateMenu: activateMenu()
7169 onDeactivateMenu: deactivateMenu()
7270 }
@@ -86,11 +84,11 @@ Indicators.BasicMenuItem {
8684 }
8785
8886 if (parameterType === "") {
89− __contents.source = "SimpleTextMessage.qml";
87+ contents.source = "SimpleTextMessage.qml";
9088 } else if (parameterType === "s") {
91− __contents.source = "TextMessage.qml";
89+ contents.source = "TextMessage.qml";
9290 } else if (parameterType === "_s") {
93− __contents.source = "SnapDecision.qml";
91+ contents.source = "SnapDecision.qml";
9492 } else {
9593 console.debug("Unknown paramater type: " + parameterType);
9694 }