Merge lp:~mardy/ubuntu-system-settings-online-accounts/mir-deprecations into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Remove calls to deprecated mir_wait_handle() function.

Remove calls to deprecated mir_wait_handle() function.

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-26 06:46:36 +0000
+++ debian/changelog	2017-02-22 08:31:29 +0000
@@ -1,3 +1,11 @@
+ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Bump dependency version on libmirclient-dev
+  * Remove calls to deprecated mir_wait_handle() function.
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 22 Feb 2017 11:29:04 +0300
+
 ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu1) zesty; urgency=medium
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2017-01-26 06:38:15 +0000
+++ debian/control	2017-02-22 08:31:29 +0000
@@ -8,7 +8,7 @@
                libaccounts-qt5-dev (>= 1.13),
                libapparmor-dev,
                libclick-0.4-dev,
-               libmirclient-dev (>= 0.14.0),
+               libmirclient-dev (>= 0.26.1),
                libnotify-dev,
                libqtdbusmock1-dev,
                libqtdbustest1-dev,

=== modified file 'online-accounts-service/mir-helper.cpp'
--- online-accounts-service/mir-helper.cpp	2014-11-25 13:18:32 +0000
+++ online-accounts-service/mir-helper.cpp	2017-02-22 08:31:29 +0000
@@ -44,7 +44,6 @@
 
     MirPromptSession *m_mirSession;
     pid_t m_initiatorPid;
-    QList<int> m_fds;
     mutable PromptSession *q_ptr;
 };
 
@@ -96,24 +95,16 @@
     delete d_ptr;
 }
 
-static void client_fd_callback(MirPromptSession *, size_t count,
-                               int const *fds, void *context)
-{
-    PromptSessionPrivate *priv = (PromptSessionPrivate *)context;
-    for (size_t i = 0; i < count; i++) {
-        priv->m_fds.append(fds[i]);
-    }
-}
-
 QString PromptSession::requestSocket()
 {
     Q_D(PromptSession);
 
-    d->m_fds.clear();
-    mir_wait_for(mir_prompt_session_new_fds_for_prompt_providers(
-        d->m_mirSession, 1, client_fd_callback, d));
-    if (!d->m_fds.isEmpty()) {
-        return QString("fd://%1").arg(d->m_fds[0]);
+    int fd = -1;
+    auto count =
+        mir_prompt_session_new_fds_for_prompt_providers_sync(d->m_mirSession,
+                                                             1, &fd);
+    if (count == 1 && fd >= 0) {
+        return QString("fd://%1").arg(fd);
     } else {
         return QString();
     }