1
=== modified file 'include/NotificationServer.h'
2
--- include/NotificationServer.h	2016-07-27 16:46:47 +0000
3
+++ include/NotificationServer.h	2016-09-13 21:23:54 +0000
4
@@ -83,7 +83,6 @@
5
83
private:
83
private:
6
84
    void incrementCounter();
84
    void incrementCounter();
7
85
    QString messageSender() const;
85
    QString messageSender() const;
8
86
    bool isCmdLine() const;
9
87
86
10
88
    QSharedPointer<Notification> buildNotification(NotificationID id, const QVariantMap &hints);
87
    QSharedPointer<Notification> buildNotification(NotificationID id, const QVariantMap &hints);
11
89
    NotificationModel &model;
88
    NotificationModel &model;
12
90
89
13
=== modified file 'src/NotificationServer.cpp'
14
--- src/NotificationServer.cpp	2016-07-27 17:12:08 +0000
15
+++ src/NotificationServer.cpp	2016-09-13 21:23:54 +0000
16
@@ -167,16 +167,6 @@
17
167
    return sender;
167
    return sender;
18
168
}
168
}
19
169
169
20
170
bool NotificationServer::isCmdLine() const {
21
171
    if (!calledFromDBus()) {
22
172
        return false;
23
173
    }
24
174
    QString sender = message().service();
25
175
    uint pid = connection().interface()->servicePid(sender);
26
176
    QString path = QDir(QString("/proc/%1/exe").arg(pid)).canonicalPath();
27
177
    return (path == "/usr/bin/notify-send");
28
178
}
29
179
30
180
void NotificationServer::serviceUnregistered(const QString &clientId) {
170
void NotificationServer::serviceUnregistered(const QString &clientId) {
31
181
    m_watcher.removeWatchedService(clientId);
171
    m_watcher.removeWatchedService(clientId);
32
182
    const auto notifications = model.removeAllNotificationsForClient(clientId);
172
    const auto notifications = model.removeAllNotificationsForClient(clientId);
33
@@ -288,7 +278,7 @@
34
288
278
35
289
    if (newNotification) {
279
    if (newNotification) {
36
290
        // Don't clean up after the command line client closes
280
        // Don't clean up after the command line client closes
38
291
        if (!isCmdLine()) {
281
        if (app_name != QStringLiteral("notify-send")) {
39
292
            m_watcher.addWatchedService(clientId);
282
            m_watcher.addWatchedService(clientId);
40
293
        }
283
        }
41
294
        model.insertNotification(notification);
284
        model.insertNotification(notification);
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2016-09-14
Unity8 CI Bot	continuous-integration		Approve on 2016-09-13
Christopher Townsend		2016-09-13	Approve on 2016-09-13
Review via email: mp+305653@code.launchpad.net