1
=== modified file 'debian/control'
2
--- debian/control	2017-02-11 00:15:05 +0000
3
+++ debian/control	2017-03-16 20:37:22 +0000
4
@@ -21,7 +21,7 @@
5
21
               libdbustest1-dev,
21
               libdbustest1-dev,
6
22
               libglib2.0-dev,
22
               libglib2.0-dev,
7
23
               libgtest-dev,
23
               libgtest-dev,
9
24
               libmirclient-dev (>= 0.5),
24
               libmirclient-dev (>= 0.26.1),
10
25
               libprocess-cpp-dev (>= 2.0.0),
25
               libprocess-cpp-dev (>= 2.0.0),
11
26
               libproperties-cpp-dev,
26
               libproperties-cpp-dev,
12
27
               libtrust-store-dev,
27
               libtrust-store-dev,
13
28
28
14
=== modified file 'service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c'
15
--- service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c	2016-03-09 02:57:02 +0000
16
+++ service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c	2017-03-16 20:37:22 +0000
17
@@ -18,24 +18,17 @@
18
18
#include "_cgo_export.h"
18
#include "_cgo_export.h"
19
19
#include "mir_prompt_session_helper.h"
19
#include "mir_prompt_session_helper.h"
20
20
20
23
21
static void _fd_getter (MirPromptSession * session, size_t count,
21
int mir_prompt_session_get_fd(MirPromptSession * session)
22
22
                 int const * fdsin, void * pfds)
24
23
{
22
{
25
23
    int fd = 0;
26
24
    size_t count = mir_prompt_session_new_fds_for_prompt_providers_sync(
27
25
        session,
28
26
        1,
29
27
        &fd);
30
28
31
24
    if (count != 1) {
29
    if (count != 1) {
32
25
        g_warning("Didn't get the right number of FDs");
30
        g_warning("Didn't get the right number of FDs");
33
26
        return;
34
27
    }
31
    }
35
28
32
36
29
    int * fds = (int *)pfds;
37
30
    fds[0] = fdsin[0];
38
31
}
39
32
40
33
int mir_prompt_session_get_fd(MirPromptSession * session)
41
34
{
42
35
    int fd = 0;
43
36
    MirWaitHandle * wait = mir_prompt_session_new_fds_for_prompt_providers(session, 1, _fd_getter, &fd);
44
37
45
38
    mir_wait_for(wait);
46
39
47
40
    return fd;
33
    return fd;
48
41
}
34
}
Status:	Needs review
Proposed branch:	lp:~cemil-azizoglu/pay-service/mir-deprecations
Merge into:	lp:pay-service
Diff against target:	48 lines (+8/-15) 2 files modified debian/control (+1/-1) service-ng/src/launchpad.net/go-mir/mir/mir_prompt_session_helper.c (+7/-14)
To merge this branch:	bzr merge lp:~cemil-azizoglu/pay-service/mir-deprecations
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alberto Aguirre (community)			Approve on 2017-03-31
unity-api-1-bot	continuous-integration		Approve on 2017-03-16
Unity API Team		2017-02-20	Pending
Review via email: mp+317801@code.launchpad.net