Merge lp:~osomon/webbrowser-app/clipboard-push-url into lp:webbrowser-app

[Olivier Tilloy]

Actually push URLs to the clipboard.
For some reason setting the "text/url-list" mime type doesn’t seem to work (or other applications do not implement pasting this kind of data), but "text/plain" works well enough for this purpose.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1059
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1886/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/643
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/643/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3185
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21167

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

Looks ok to me,

review: Approve

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-06-02 14:26:38 +0000
+++ src/app/webbrowser/Browser.qml	2015-06-12 11:25:23 +0000
@@ -749,7 +749,7 @@
                     }
                     Actions.CopyLink {
                         enabled: contextualData.href.toString()
-                        onTriggered: Clipboard.push([contextualData.href])
+                        onTriggered: Clipboard.push(["text/plain", contextualData.href.toString()])
                     }
                     Actions.ShareLink {
                         enabled: (formFactor == "mobile") && contextualData.href.toString()
@@ -761,7 +761,7 @@
                     }
                     Actions.CopyImage {
                         enabled: contextualData.img.toString()
-                        onTriggered: Clipboard.push([contextualData.img])
+                        onTriggered: Clipboard.push(["text/plain", contextualData.img.toString()])
                     }
                     Actions.SaveImage {
                         enabled: contextualData.img.toString() && downloadLoader.status == Loader.Ready

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2015-05-27 16:19:45 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2015-06-12 11:25:23 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -69,11 +69,11 @@
     contextualActions: ActionList {
         Actions.CopyLink {
             enabled: webview.contextualData.href.toString()
-            onTriggered: Clipboard.push([webview.contextualData.href])
+            onTriggered: Clipboard.push(["text/plain", webview.contextualData.href.toString()])
         }
         Actions.CopyImage {
             enabled: webview.contextualData.img.toString()
-            onTriggered: Clipboard.push([webview.contextualData.img])
+            onTriggered: Clipboard.push(["text/plain", webview.contextualData.img.toString()])
         }
     }