ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/wifi-lacking-icons-fix-1364366 into lp:ubuntu-system-settings

  1. wifi-lacking-icons-fix-1364366
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1020
Merged at revision: 1025
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/wifi-lacking-icons-fix-1364366
Merge into: lp:ubuntu-system-settings
Diff against target: 11 lines (+0/-1)
1 file modified
plugins/wifi/MenuItemFactory.qml (+0/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/wifi-lacking-icons-fix-1364366
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+234143@code.launchpad.net

Commit message

[wifi] factory was setting the icon property, which was causing the icon to not render

Description of the change

[wifi] factory was setting the icon property, which was causing the icon to not render

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1445/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/637
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5939
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5939/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13018
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3761
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3761/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1445/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/wifi/MenuItemFactory.qml'
2--- plugins/wifi/MenuItemFactory.qml 2013-09-18 19:42:21 +0000
3+++ plugins/wifi/MenuItemFactory.qml 2014-09-10 15:43:01 +0000
4@@ -102,7 +102,6 @@
5 }
6
7 text: menu && menu.label ? menu.label : ""
8- icon: menu ? menu.icon : ""
9 secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false
10 adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false
11 checked: menu ? menu.isToggled : false

Subscribers

People subscribed via source and target branches