Merge lp:~online-accounts/ubuntu-system-settings-online-accounts/master into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Merge from upstream

- Anchor the webview directly to the OSK (LP: #1413765)
- Fix click hook to rebuild service list in the accounts DB

Merge from upstream

- Anchor the webview directly to the OSK (LP: #1413765)
- Fix click hook to rebuild service list in the accounts DB

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/960
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/960/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17399

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

review: Approve (continuous-integration)

[lp:~online-accounts/ubuntu-system-settings-online-accounts/master]

222. By Launchpad Translations on behalf of online-accounts on 2015-01-24

Launchpad automatic translations update.

223. By Launchpad Translations on behalf of online-accounts on 2015-01-26

Launchpad automatic translations update.

224. By Alberto Mardegan on 2015-01-26

Merge from upstream

- Anchor the webview directly to the OSK (LP: #1413765)
- Fix click hook to rebuild service list in the accounts DB
 Fixes: #1413765
Approved by: PS Jenkins bot

=== modified file 'click-hooks/main.cpp'
--- click-hooks/main.cpp	2014-11-04 12:20:07 +0000
+++ click-hooks/main.cpp	2015-01-23 15:18:41 +0000
@@ -322,6 +322,7 @@
      */
     Accounts::Manager *manager =
         new Accounts::Manager(Accounts::Manager::DisableNotifications);
+    manager->serviceList();
     delete manager;
 
     return EXIT_SUCCESS;
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-01-16 17:18:06 +0000
+++ debian/changelog	2015-01-23 15:18:41 +0000
@@ -1,3 +1,11 @@
+ubuntu-system-settings-online-accounts (0.6+15.04.20150116-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream
+    - Anchor the webview directly to the OSK (LP: #1413765)
+    - Fix click hook to rebuild service list in the accounts DB
+        
+ -- Alberto Mardegan <[e-mail]>  Fri, 23 Jan 2015 16:14:45 +0100
+
 ubuntu-system-settings-online-accounts (0.6+15.04.20150116-0ubuntu1) vivid; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml	2015-01-09 10:54:15 +0000
+++ plugins/module/OAuth.qml	2015-01-23 15:18:41 +0000
@@ -130,8 +130,7 @@
             top: parent.top
             left: parent.left
             right: parent.right
-            bottom: cancelButton.top
-            bottomMargin: Math.max(osk.height - cancelButton.height, 0)
+            bottom: Qt.inputMethod.visible ? osk.top : cancelButton.top
         }
         focus: true
         visible: !loading