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

[Alberto Mardegan]

  Fix QQmlExpression's invalid context warning

  The bug was caused because we are destroying the page while the Ubuntu UI
  toolkit is still playing the fading out animation for the dialog which prompts
  for the removal confirmation.
  The fix consists of emitting the closed() signal (and therefore proceed with
  the removal of the account) only after the dialog animation has been completed.
  This is a sequential animation, whose last step is setting the "visible"
  property to false.

  Fix QQmlExpression's invalid context warning

  The bug was caused because we are destroying the page while the Ubuntu UI
  toolkit is still playing the fading out animation for the dialog which prompts
  for the removal confirmation.
  The fix consists of emitting the closed() signal (and therefore proceed with
  the removal of the account) only after the dialog animation has been completed.
  This is a sequential animation, whose last step is setting the "visible"
  property to false.

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

112. By Alberto Mardegan on 2014-05-30

Merge from master

[ Martin Pitt ]
* Fix wrong title check in autopilot test. Run autopilot under Xvfb
  and dbus-launch in the autopkgtest, and add missing autopilot-
  desktop test dependency. (LP: #1320175)
[ Alberto Mardegan ]
* Complete the service-side implementation of the access request API.
[ Ubuntu daily release ]
* New rebuild forced

[Justin McPherson (justinmcp)]

review: Approve

=== modified file 'src/module/RemovalConfirmation.qml'
--- src/module/RemovalConfirmation.qml	2013-06-24 16:25:20 +0000
+++ src/module/RemovalConfirmation.qml	2014-05-30 07:19:19 +0000
@@ -32,6 +32,8 @@
     title: i18n.dtr("ubuntu-system-settings-online-accounts", "Remove account")
     text: i18n.dtr("ubuntu-system-settings-online-accounts", "The %1 account will be removed only from your phone. You can add it again later.").arg(accountName)
 
+    onVisibleChanged: if (!visible) closed()
+
     Button {
         text: i18n.dtr("ubuntu-system-settings-online-accounts", "Remove")
         onClicked: setConfirmed(true)
@@ -45,6 +47,5 @@
     function setConfirmed(isConfirmed) {
         confirmed = isConfirmed
         PopupUtils.close(root)
-        closed()
     }
 }