1
=== modified file 'plugins/AccountsService/AccountsService.cpp'
2
--- plugins/AccountsService/AccountsService.cpp	2014-11-28 15:55:08 +0000
3
+++ plugins/AccountsService/AccountsService.cpp	2015-03-04 15:58:00 +0000
4
@@ -152,7 +152,7 @@
5
152
152
6
153
void AccountsService::updateBackgroundFile()
153
void AccountsService::updateBackgroundFile()
7
154
{
154
{
9
155
    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
155
    QString backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
10
156
    if (m_backgroundFile != backgroundFile) {
156
    if (m_backgroundFile != backgroundFile) {
11
157
        m_backgroundFile = backgroundFile;
157
        m_backgroundFile = backgroundFile;
12
158
        Q_EMIT backgroundFileChanged();
158
        Q_EMIT backgroundFileChanged();
13
159
159
14
=== modified file 'plugins/AccountsService/AccountsServiceDBusAdaptor.cpp'
15
--- plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2014-12-12 10:00:31 +0000
16
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2015-03-04 15:58:00 +0000
17
@@ -25,7 +25,8 @@
18
25
AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)
25
AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)
19
26
  : QObject(parent),
26
  : QObject(parent),
20
27
    m_accountsManager(nullptr),
27
    m_accountsManager(nullptr),
22
28
    m_users()
28
    m_users(),
23
29
    m_ignoreNextChanged(false)
24
29
{
30
{
25
30
    QDBusConnection connection = QDBusConnection::SM_BUSNAME();
31
    QDBusConnection connection = QDBusConnection::SM_BUSNAME();
26
31
    QDBusConnectionInterface *interface = connection.interface();
32
    QDBusConnectionInterface *interface = connection.interface();
27
@@ -75,11 +76,19 @@
28
75
    combined.removeDuplicates();
76
    combined.removeDuplicates();
29
76
77
30
77
    Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);
78
    Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);
31
79
32
80
    // In case a non-builtin property changes, we're getting propertiesChanged *and* changed
33
81
    // As the generic changed requires asking back over DBus, it's quite slow to process.
34
82
    // We don't want to trigger that when we know it's not a built-in property change.
35
83
    m_ignoreNextChanged = true;
36
78
}
84
}
37
79
85
38
80
void AccountsServiceDBusAdaptor::maybeChangedSlot()
86
void AccountsServiceDBusAdaptor::maybeChangedSlot()
39
81
{
87
{
41
82
    Q_EMIT maybeChanged(getUserForPath(message().path()));
88
    if (!m_ignoreNextChanged) {
42
89
        Q_EMIT maybeChanged(getUserForPath(message().path()));
43
90
    }
44
91
    m_ignoreNextChanged = false;
45
83
}
92
}
46
84
93
47
85
QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
94
QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
48
86
95
49
=== modified file 'plugins/AccountsService/AccountsServiceDBusAdaptor.h'
50
--- plugins/AccountsService/AccountsServiceDBusAdaptor.h	2015-02-04 09:41:40 +0000
51
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.h	2015-03-04 15:58:00 +0000
52
@@ -61,6 +61,8 @@
53
61
61
54
62
    QDBusInterface *m_accountsManager;
62
    QDBusInterface *m_accountsManager;
55
63
    QMap<QString, QDBusInterface *> m_users;
63
    QMap<QString, QDBusInterface *> m_users;
56
64
57
65
    bool m_ignoreNextChanged;
58
64
};
66
};
59
65
67
60
66
#endif
68
#endif
61
67
69
62
=== modified file 'plugins/Unity/Launcher/gsettings.cpp'
63
--- plugins/Unity/Launcher/gsettings.cpp	2014-10-02 13:34:11 +0000
64
+++ plugins/Unity/Launcher/gsettings.cpp	2015-03-04 15:58:00 +0000
65
@@ -59,12 +59,19 @@
66
59
    Q_FOREACH(const QString &entry, storedApplications) {
59
    Q_FOREACH(const QString &entry, storedApplications) {
67
60
        gSettingsList << QString("appid://%1").arg(entry);
60
        gSettingsList << QString("appid://%1").arg(entry);
68
61
    }
61
    }
69
62
    // GSettings will emit a changed signal to ourselves. Let's cache the items
70
63
    // and only forward the changed signal when the list did actually change.
71
64
    m_cachedItems = gSettingsList;
72
62
    m_gSettings->set("items", gSettingsList);
65
    m_gSettings->set("items", gSettingsList);
73
63
}
66
}
74
64
67
75
65
void GSettings::onSettingsChanged(const QString &key)
68
void GSettings::onSettingsChanged(const QString &key)
76
66
{
69
{
77
67
    if (key == "items") {
70
    if (key == "items") {
79
68
        Q_EMIT changed();
71
        QStringList cachedItems = m_gSettings->get("items").toStringList();
80
72
        if (m_cachedItems != cachedItems) {
81
73
            m_cachedItems = cachedItems;
82
74
            Q_EMIT changed();
83
75
        }
84
69
    }
76
    }
85
70
}
77
}
86
71
78
87
=== modified file 'plugins/Unity/Launcher/gsettings.h'
88
--- plugins/Unity/Launcher/gsettings.h	2014-10-02 13:34:11 +0000
89
+++ plugins/Unity/Launcher/gsettings.h	2015-03-04 15:58:00 +0000
90
@@ -41,6 +41,7 @@
91
41
41
92
42
private:
42
private:
93
43
    QGSettings *m_gSettings;
43
    QGSettings *m_gSettings;
94
44
    QStringList m_cachedItems;
95
44
};
45
};
96
45
46
97
46
#endif
47
#endif
Reviewer	Review Type	Date Requested	Status
Michael Terry		2015-03-03	Approve on 2015-03-04
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-03-04
Review via email: mp+251567@code.launchpad.net