Merge lp:~nick-dedekind/unity8/indicator-messages.icon-fix into lp:unity8

[Nick Dedekind]

Fixed the removal of messaging widget due to incompatible action state.

Fixed the removal of messaging widget due to incompatible action state.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:320
http://jenkins.qa.ubuntu.com/job/unity8-ci/1008/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3404
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1009
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/935/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/791

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1008/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/443/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2219
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3481
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/444
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3493
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3493/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1011
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1011/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/860

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/Indicators/DefaultIndicatorWidget.qml'
--- Panel/Indicators/DefaultIndicatorWidget.qml	2013-09-09 14:34:15 +0000
+++ Panel/Indicators/DefaultIndicatorWidget.qml	2013-09-13 17:25:13 +0000
@@ -24,6 +24,7 @@
 Indicators.IndicatorWidget {
     id: indicatorWidget
 
+    enabled:true
     width: itemRow.width + units.gu(0.5)
 
     property alias label: itemLabel.text
@@ -63,19 +64,14 @@
 
     onActionStateChanged: {
         if (action == undefined || !action.valid) {
-            enabled = false;
             return;
         }
 
         if (action.state == undefined) {
-            label = "";
-            iconSource = "";
-            enabled = false;
             return;
         }
 
         label = action.state[Indicators.ActionState.Label];
         iconSource = "image://theme/" + action.state[Indicators.ActionState.IconSource];
-        enabled = action.state[Indicators.ActionState.Visible];
     }
 }