Merge lp:~cyphermox/ubuntu-system-settings/providePinCode into lp:ubuntu-system-settings

[Mathieu Trudel-Lapierre]

Fix PIN code or passcode requests by properly matching the tag for the original request.

Fix PIN code or passcode requests by properly matching the tag for the original request.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1303/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3915
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5328
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3407/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks fine to me, thanks

review: Approve

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-08-21 13:29:08 +0000
+++ plugins/bluetooth/PageComponent.qml	2014-08-26 17:17:38 +0000
@@ -51,19 +51,22 @@
     Connections {
         target: backend.agent
         onPasskeyConfirmationNeeded: {
+            var request_tag = tag
             var popup = PopupUtils.open(confirmPasskeyDialog, root, {passkey: passkey, name: device.name})
-            popup.canceled.connect(function() {target.confirmPasskey(tag, false)})
-            popup.confirmed.connect(function() {target.confirmPasskey(tag, true)})
+            popup.canceled.connect(function() {target.confirmPasskey(request_tag, false)})
+            popup.confirmed.connect(function() {target.confirmPasskey(request_tag, true)})
         }
         onPasskeyNeeded: {
+            var request_tag = tag
             var popup = PopupUtils.open(providePasskeyDialog, root, {name: device.name})
-            popup.canceled.connect(function() {target.providePasskey(tag, false, 0)})
-            popup.provided.connect(function(passkey) {target.providePasskey(tag, true, passkey)})
+            popup.canceled.connect(function() {target.providePasskey(request_tag, false, 0)})
+            popup.provided.connect(function(passkey) {target.providePasskey(request_tag, true, passkey)})
         }
         onPinCodeNeeded: {
+            var request_tag = tag
             var popup = PopupUtils.open(providePinCodeDialog, root, {name: device.name})
-            popup.canceled.connect(function() {target.providePinCode(tag, false, "")})
-            popup.provided.connect(function(pinCode) {target.providePinCode(tag, true, pinCode)})
+            popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
+            popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
         }
     }