Merge lp:~ken-vandine/ubuntu-system-settings/wifi_activate_on_click into lp:ubuntu-system-settings

[Ken VanDine]

Activate the accessPoint on click

Activate the accessPoint on click

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/3
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/79/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/82
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/82
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21020

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/85
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21024

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

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== modified file 'plugins/wifi/AccessPoint.qml'
--- plugins/wifi/AccessPoint.qml	2014-08-29 12:49:17 +0000
+++ plugins/wifi/AccessPoint.qml	2015-06-08 16:33:03 +0000
@@ -75,6 +75,8 @@
         if (checked) {
             pageStack.push(Qt.resolvedUrl("NetworkDetailsBrief.qml"),
             {networkName : text, accessPoint: accessPoint})
+        } else {
+            accessPoint.activate();
         }
     }
 }