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

Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 420
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/mir-deprecations
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 71 lines (+15/-16)
3 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
online-accounts-service/mir-helper.cpp (+6/-15)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/mir-deprecations
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
Review via email: mp+317949@code.launchpad.net

Commit message

Remove calls to deprecated mir_wait_handle() function.

Description of the change

Remove calls to deprecated mir_wait_handle() function.

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu2) UNRELEASED; urgency=medium
2
3 * debian/control:
4 - Bump dependency version on libmirclient-dev
5 * Remove calls to deprecated mir_wait_handle() function.
6
7 -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 22 Feb 2017 11:29:04 +0300
8
1ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu1) zesty; urgency=medium9ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu1) zesty; urgency=medium
210
3 * debian/control:11 * debian/control:
412
=== 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 @@
8 libaccounts-qt5-dev (>= 1.13),8 libaccounts-qt5-dev (>= 1.13),
9 libapparmor-dev,9 libapparmor-dev,
10 libclick-0.4-dev,10 libclick-0.4-dev,
11 libmirclient-dev (>= 0.14.0),11 libmirclient-dev (>= 0.26.1),
12 libnotify-dev,12 libnotify-dev,
13 libqtdbusmock1-dev,13 libqtdbusmock1-dev,
14 libqtdbustest1-dev,14 libqtdbustest1-dev,
1515
=== 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 @@
4444
45 MirPromptSession *m_mirSession;45 MirPromptSession *m_mirSession;
46 pid_t m_initiatorPid;46 pid_t m_initiatorPid;
47 QList<int> m_fds;
48 mutable PromptSession *q_ptr;47 mutable PromptSession *q_ptr;
49};48};
5049
@@ -96,24 +95,16 @@
96 delete d_ptr;95 delete d_ptr;
97}96}
9897
99static void client_fd_callback(MirPromptSession *, size_t count,
100 int const *fds, void *context)
101{
102 PromptSessionPrivate *priv = (PromptSessionPrivate *)context;
103 for (size_t i = 0; i < count; i++) {
104 priv->m_fds.append(fds[i]);
105 }
106}
107
108QString PromptSession::requestSocket()98QString PromptSession::requestSocket()
109{99{
110 Q_D(PromptSession);100 Q_D(PromptSession);
111101
112 d->m_fds.clear();102 int fd = -1;
113 mir_wait_for(mir_prompt_session_new_fds_for_prompt_providers(103 auto count =
114 d->m_mirSession, 1, client_fd_callback, d));104 mir_prompt_session_new_fds_for_prompt_providers_sync(d->m_mirSession,
115 if (!d->m_fds.isEmpty()) {105 1, &fd);
116 return QString("fd://%1").arg(d->m_fds[0]);106 if (count == 1 && fd >= 0) {
107 return QString("fd://%1").arg(fd);
117 } else {108 } else {
118 return QString();109 return QString();
119 }110 }

Subscribers

People subscribed via source and target branches