Merge lp:~osomon/webbrowser-app/fix-uastring-regression into lp:webbrowser-app

[Olivier Tilloy]

Fix the conditional user-agent string based on form factor.

[Günter Schwann (schwann)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/79
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/74

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/156/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Browser/UbuntuWebView.qml'
--- src/Ubuntu/Browser/UbuntuWebView.qml	2013-06-07 08:37:10 +0000
+++ src/Ubuntu/Browser/UbuntuWebView.qml	2013-06-13 08:46:25 +0000
@@ -59,9 +59,9 @@
         // this should be changed to a more neutral user-agent in the
         // future as we don’t want websites to recommend installing
         // their iPhone/iPad apps.
-        if (formFactor === formFactor.phone) {
+        if (_webview.formFactor === formFactor.phone) {
             return "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
-        } else if (formFactor === formFactor.tablet) {
+        } else if (_webview.formFactor === formFactor.tablet) {
             return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
         } else {
             return ""