1
=== modified file 'src/modules/Unity/Application/dbusfocusinfo.cpp'
2
--- src/modules/Unity/Application/dbusfocusinfo.cpp	2016-07-05 13:26:14 +0000
3
+++ src/modules/Unity/Application/dbusfocusinfo.cpp	2016-08-25 15:28:41 +0000
4
@@ -71,19 +71,25 @@
5
71
SessionInterface* DBusFocusInfo::findSessionWithPid(const QSet<pid_t> &pidSet)
71
SessionInterface* DBusFocusInfo::findSessionWithPid(const QSet<pid_t> &pidSet)
6
72
{
72
{
7
73
    Q_FOREACH (Application* application, m_applications) {
73
    Q_FOREACH (Application* application, m_applications) {
20
74
        auto session = application->session();
74
        SessionInterface *sessionWithPid = findSessionWithPid(application->session(), pidSet);
21
75
        if (pidSet.contains(session->pid())) {
75
        if (sessionWithPid) {
22
76
            return session;
76
            return sessionWithPid;
11
77
        }
12
78
        SessionInterface *chosenChildSession = nullptr;
13
79
        session->foreachChildSession([&](SessionInterface* childSession) {
14
80
            if (pidSet.contains(childSession->pid())) {
15
81
                chosenChildSession = childSession;
16
82
            }
17
83
        });
18
84
        if (chosenChildSession) {
19
85
            return chosenChildSession;
23
86
        }
77
        }
24
87
    }
78
    }
25
88
    return nullptr;
79
    return nullptr;
26
89
}
80
}
27
81
28
82
SessionInterface* DBusFocusInfo::findSessionWithPid(SessionInterface* session, const QSet<pid_t> &pidSet)
29
83
{
30
84
    if (pidSet.contains(session->pid())) {
31
85
        return session;
32
86
    }
33
87
34
88
    SessionInterface *sessionWithPid = nullptr;
35
89
    session->foreachChildSession([&](SessionInterface* childSession) {
36
90
        if (!sessionWithPid) {
37
91
            sessionWithPid = findSessionWithPid(childSession, pidSet);
38
92
        }
39
93
    });
40
94
    return sessionWithPid;
41
95
}
42
90
96
43
=== modified file 'src/modules/Unity/Application/dbusfocusinfo.h'
44
--- src/modules/Unity/Application/dbusfocusinfo.h	2016-07-01 16:15:54 +0000
45
+++ src/modules/Unity/Application/dbusfocusinfo.h	2016-08-25 15:28:41 +0000
46
@@ -45,6 +45,7 @@
47
45
private:
45
private:
48
46
    QSet<pid_t> fetchAssociatedPids(pid_t pid);
46
    QSet<pid_t> fetchAssociatedPids(pid_t pid);
49
47
    SessionInterface* findSessionWithPid(const QSet<pid_t> &pidSet);
47
    SessionInterface* findSessionWithPid(const QSet<pid_t> &pidSet);
50
48
    SessionInterface* findSessionWithPid(SessionInterface* session, const QSet<pid_t> &pidSet);
51
48
49
52
49
    const QList<Application*> &m_applications;
50
    const QList<Application*> &m_applications;
53
50
51
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot (community)	continuous-integration		Approve on 2016-08-25
Gerry Boland (community)		2016-08-25	Approve on 2016-08-25
Review via email: mp+303946@code.launchpad.net