1
=== modified file 'plugins/LightDM/CMakeLists.txt'
2
--- plugins/LightDM/CMakeLists.txt	2014-06-18 17:26:30 +0000
3
+++ plugins/LightDM/CMakeLists.txt	2014-10-15 17:55:21 +0000
4
@@ -10,6 +10,7 @@
5
10
    ${CMAKE_SOURCE_DIR}/plugins/Utils
10
    ${CMAKE_SOURCE_DIR}/plugins/Utils
6
11
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
11
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
7
12
    #${LIBLIGHTDM_INCLUDE_DIRS}
12
    #${LIBLIGHTDM_INCLUDE_DIRS}
8
13
    ${libunity8-private_SOURCE_DIR}
9
13
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
14
    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
10
14
)
15
)
11
15
16
12
@@ -28,6 +29,7 @@
13
28
29
14
29
target_link_libraries(LightDM-qml
30
target_link_libraries(LightDM-qml
15
30
    MockLightDM-demo
31
    MockLightDM-demo
16
32
    unity8-private
17
31
# TODO: Once we split out a separate greeter process, uncomment these lines
33
# TODO: Once we split out a separate greeter process, uncomment these lines
18
32
#    ${LIBLIGHTDM_LDFLAGS}
34
#    ${LIBLIGHTDM_LDFLAGS}
19
33
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
35
    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
20
34
36
21
=== modified file 'plugins/LightDM/DBusGreeter.cpp'
22
--- plugins/LightDM/DBusGreeter.cpp	2014-08-27 15:11:21 +0000
23
+++ plugins/LightDM/DBusGreeter.cpp	2014-10-15 17:55:21 +0000
24
@@ -20,11 +20,9 @@
25
20
#include <QDBusMessage>
20
#include <QDBusMessage>
26
21
#include <QStringList>
21
#include <QStringList>
27
22
22
33
23
DBusGreeter::DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path)
23
DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)
34
24
 : QObject(greeter),
24
 : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),
35
25
   m_greeter(greeter),
25
   m_greeter(greeter)
31
26
   m_connection(connection),
32
27
   m_path(path)
36
28
{
26
{
37
29
    connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));
27
    connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));
38
30
}
28
}
39
@@ -49,22 +47,3 @@
40
49
    notifyPropertyChanged("IsActive", isActive());
47
    notifyPropertyChanged("IsActive", isActive());
41
50
    Q_EMIT isActiveChanged();
48
    Q_EMIT isActiveChanged();
42
51
}
49
}
43
52
44
53
// Manually emit a PropertiesChanged signal over DBus, because QtDBus
45
54
// doesn't do it for us on Q_PROPERTIES, oddly enough.
46
55
void DBusGreeter::notifyPropertyChanged(const QString& propertyName, const QVariant &value)
47
56
{
48
57
    QDBusMessage message;
49
58
    QVariantMap changedProps;
50
59
51
60
    changedProps.insert(propertyName, value);
52
61
53
62
    message = QDBusMessage::createSignal(m_path,
54
63
                                         "org.freedesktop.DBus.Properties",
55
64
                                         "PropertiesChanged");
56
65
    message << "com.canonical.UnityGreeter";
57
66
    message << changedProps;
58
67
    message << QStringList();
59
68
60
69
    m_connection.send(message);
61
70
}
62
71
50
63
=== modified file 'plugins/LightDM/DBusGreeter.h'
64
--- plugins/LightDM/DBusGreeter.h	2014-09-05 11:57:35 +0000
65
+++ plugins/LightDM/DBusGreeter.h	2014-10-15 17:55:21 +0000
66
@@ -17,15 +17,15 @@
67
17
#ifndef UNITY_DBUSGREETER_H
17
#ifndef UNITY_DBUSGREETER_H
68
18
#define UNITY_DBUSGREETER_H
18
#define UNITY_DBUSGREETER_H
69
19
19
70
20
#include "unitydbusobject.h"
71
20
#include <QDBusConnection>
21
#include <QDBusConnection>
72
21
#include <QObject>
73
22
22
74
23
class Greeter;
23
class Greeter;
75
24
24
76
25
/** This is an internal class used to talk with the indicators.
25
/** This is an internal class used to talk with the indicators.
77
26
  */
26
  */
78
27
27
80
28
class DBusGreeter : public QObject
28
class DBusGreeter : public UnityDBusObject
81
29
{
29
{
82
30
    Q_OBJECT
30
    Q_OBJECT
83
31
    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter")
31
    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter")
84
@@ -33,7 +33,7 @@
85
33
    Q_PROPERTY(bool IsActive READ isActive NOTIFY isActiveChanged) // since 14.10
33
    Q_PROPERTY(bool IsActive READ isActive NOTIFY isActiveChanged) // since 14.10
86
34
34
87
35
public:
35
public:
89
36
    explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);
36
    explicit DBusGreeter(Greeter *greeter, const QString &path);
90
37
37
91
38
    bool isActive() const;
38
    bool isActive() const;
92
39
    Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
39
    Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
93
@@ -44,12 +44,9 @@
94
44
44
95
45
private Q_SLOTS:
45
private Q_SLOTS:
96
46
    void isActiveChangedHandler();
46
    void isActiveChangedHandler();
97
47
    void notifyPropertyChanged(const QString &propertyName, const QVariant &value);
98
48
47
99
49
private:
48
private:
100
50
    Greeter *m_greeter;
49
    Greeter *m_greeter;
101
51
    QDBusConnection m_connection;
102
52
    QString m_path;
103
53
};
50
};
104
54
51
105
55
#endif
52
#endif
106
56
53
107
=== modified file 'plugins/LightDM/DBusGreeterList.cpp'
108
--- plugins/LightDM/DBusGreeterList.cpp	2013-12-03 16:55:03 +0000
109
+++ plugins/LightDM/DBusGreeterList.cpp	2014-10-15 17:55:21 +0000
110
@@ -20,11 +20,9 @@
111
20
#include <QDBusMessage>
20
#include <QDBusMessage>
112
21
#include <QStringList>
21
#include <QStringList>
113
22
22
119
23
DBusGreeterList::DBusGreeterList(Greeter *greeter, const QDBusConnection &connection, const QString &path)
23
DBusGreeterList::DBusGreeterList(Greeter *greeter, const QString &path)
120
24
 : QObject(greeter),
24
 : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),
121
25
   m_greeter(greeter),
25
   m_greeter(greeter)
117
26
   m_connection(connection),
118
27
   m_path(path)
122
28
{
26
{
123
29
    connect(m_greeter, SIGNAL(authenticationUserChanged(const QString &)), this, SLOT(authenticationUserChangedHandler(const QString &)));
27
    connect(m_greeter, SIGNAL(authenticationUserChanged(const QString &)), this, SLOT(authenticationUserChangedHandler(const QString &)));
124
30
    connect(m_greeter, SIGNAL(promptlessChanged()), this, SLOT(promptlessChangedHandler()));
28
    connect(m_greeter, SIGNAL(promptlessChanged()), this, SLOT(promptlessChangedHandler()));
125
@@ -56,22 +54,3 @@
126
56
    notifyPropertyChanged("EntryIsLocked", entryIsLocked());
54
    notifyPropertyChanged("EntryIsLocked", entryIsLocked());
127
57
    Q_EMIT entryIsLockedChanged();
55
    Q_EMIT entryIsLockedChanged();
128
58
}
56
}
129
59
130
60
// Manually emit a PropertiesChanged signal over DBus, because QtDBus
131
61
// doesn't do it for us on Q_PROPERTIES, oddly enough.
132
62
void DBusGreeterList::notifyPropertyChanged(const QString& propertyName, const QVariant &value)
133
63
{
134
64
    QDBusMessage message;
135
65
    QVariantMap changedProps;
136
66
137
67
    changedProps.insert(propertyName, value);
138
68
139
69
    message = QDBusMessage::createSignal(m_path,
140
70
                                         "org.freedesktop.DBus.Properties",
141
71
                                         "PropertiesChanged");
142
72
    message << "com.canonical.UnityGreeter.List";
143
73
    message << changedProps;
144
74
    message << QStringList();
145
75
146
76
    m_connection.send(message);
147
77
}
148
78
57
149
=== modified file 'plugins/LightDM/DBusGreeterList.h'
150
--- plugins/LightDM/DBusGreeterList.h	2014-09-05 11:57:35 +0000
151
+++ plugins/LightDM/DBusGreeterList.h	2014-10-15 17:55:21 +0000
152
@@ -17,15 +17,15 @@
153
17
#ifndef UNITY_DBUSGREETERLIST_H
17
#ifndef UNITY_DBUSGREETERLIST_H
154
18
#define UNITY_DBUSGREETERLIST_H
18
#define UNITY_DBUSGREETERLIST_H
155
19
19
156
20
#include "unitydbusobject.h"
157
20
#include <QDBusConnection>
21
#include <QDBusConnection>
158
21
#include <QObject>
159
22
22
160
23
class Greeter;
23
class Greeter;
161
24
24
162
25
/** This is an internal class used to talk with the indicators.
25
/** This is an internal class used to talk with the indicators.
163
26
  */
26
  */
164
27
27
166
28
class DBusGreeterList : public QObject
28
class DBusGreeterList : public UnityDBusObject
167
29
{
29
{
168
30
    Q_OBJECT
30
    Q_OBJECT
169
31
    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter.List")
31
    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter.List")
170
@@ -34,7 +34,7 @@
171
34
    Q_PROPERTY(bool EntryIsLocked READ entryIsLocked NOTIFY entryIsLockedChanged) // since 14.04
34
    Q_PROPERTY(bool EntryIsLocked READ entryIsLocked NOTIFY entryIsLockedChanged) // since 14.04
172
35
35
173
36
public:
36
public:
175
37
    explicit DBusGreeterList(Greeter *greeter, const QDBusConnection &connection, const QString &path);
37
    explicit DBusGreeterList(Greeter *greeter, const QString &path);
176
38
38
177
39
    Q_SCRIPTABLE void SetActiveEntry(const QString &entry); // since 13.04
39
    Q_SCRIPTABLE void SetActiveEntry(const QString &entry); // since 13.04
178
40
    Q_SCRIPTABLE QString GetActiveEntry() const; // since 13.10
40
    Q_SCRIPTABLE QString GetActiveEntry() const; // since 13.10
179
@@ -49,12 +49,9 @@
180
49
private Q_SLOTS:
49
private Q_SLOTS:
181
50
    void authenticationUserChangedHandler(const QString &user);
50
    void authenticationUserChangedHandler(const QString &user);
182
51
    void promptlessChangedHandler();
51
    void promptlessChangedHandler();
183
52
    void notifyPropertyChanged(const QString &propertyName, const QVariant &value);
184
53
52
185
54
private:
53
private:
186
55
    Greeter *m_greeter;
54
    Greeter *m_greeter;
187
56
    QDBusConnection m_connection;
188
57
    QString m_path;
189
58
};
55
};
190
59
56
191
60
#endif
57
#endif
192
61
58
193
=== modified file 'plugins/LightDM/plugin.cpp'
194
--- plugins/LightDM/plugin.cpp	2014-07-01 20:23:44 +0000
195
+++ plugins/LightDM/plugin.cpp	2014-10-15 17:55:21 +0000
196
@@ -30,21 +30,14 @@
197
30
#include <QDBusConnection>
30
#include <QDBusConnection>
198
31
#include <QtQml/qqml.h>
31
#include <QtQml/qqml.h>
199
32
32
200
33
static const char* GREETER_LIST_DBUS_PATH = "/list";
201
34
static const char* GREETER_DBUS_SERVICE = "com.canonical.UnityGreeter";
202
35
203
36
static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
33
static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
204
37
{
34
{
205
38
    Q_UNUSED(engine)
35
    Q_UNUSED(engine)
206
39
    Q_UNUSED(scriptEngine)
36
    Q_UNUSED(scriptEngine)
207
40
37
208
41
    Greeter *greeter = new Greeter();
38
    Greeter *greeter = new Greeter();
215
42
    QDBusConnection connection = QDBusConnection::sessionBus();
39
    new DBusGreeter(greeter, "/");
216
43
    DBusGreeter *root = new DBusGreeter(greeter, connection, "/");
40
    new DBusGreeterList(greeter, "/list");
211
44
    connection.registerObject("/", root, QDBusConnection::ExportScriptableContents);
212
45
    DBusGreeterList *list = new DBusGreeterList(greeter, connection, GREETER_LIST_DBUS_PATH);
213
46
    connection.registerObject(GREETER_LIST_DBUS_PATH, list, QDBusConnection::ExportScriptableContents);
214
47
    connection.registerService(GREETER_DBUS_SERVICE);
217
48
41
218
49
    return greeter;
42
    return greeter;
219
50
}
43
}
220
51
44
221
=== modified file 'plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp'
222
--- plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp	2014-09-02 10:14:23 +0000
223
+++ plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp	2014-10-15 17:55:21 +0000
224
@@ -21,12 +21,8 @@
225
21
#include <QDebug>
21
#include <QDebug>
226
22
22
227
23
DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):
23
DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):
229
24
    QObject(parent)
24
    UnityDBusObject("/com/canonical/UnityDash", "com.canonical.UnityDash", false, parent)
230
25
{
25
{
231
26
    QDBusConnection connection = QDBusConnection::sessionBus();
232
27
233
28
    connection.registerService("com.canonical.UnityDash");
234
29
    connection.registerObject("/com/canonical/UnityDash", this, QDBusConnection::ExportScriptableSlots);
235
30
}
26
}
236
31
27
237
32
DBusDashCommunicatorService::~DBusDashCommunicatorService()
28
DBusDashCommunicatorService::~DBusDashCommunicatorService()
238
33
29
239
=== modified file 'plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h'
240
--- plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h	2014-09-02 10:14:23 +0000
241
+++ plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h	2014-10-15 17:55:21 +0000
242
@@ -17,9 +17,9 @@
243
17
#ifndef DBUSDASHCOMMUNICATORSERVICE_H
17
#ifndef DBUSDASHCOMMUNICATORSERVICE_H
244
18
#define DBUSDASHCOMMUNICATORSERVICE_H
18
#define DBUSDASHCOMMUNICATORSERVICE_H
245
19
19
247
20
#include <QObject>
20
#include "unitydbusobject.h"
248
21
21
250
22
class DBusDashCommunicatorService: public QObject
22
class DBusDashCommunicatorService: public UnityDBusObject
251
23
{
23
{
252
24
    Q_OBJECT
24
    Q_OBJECT
253
25
    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")
25
    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")
254
26
26
255
=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
256
--- plugins/Unity/Launcher/CMakeLists.txt	2014-09-29 09:43:18 +0000
257
+++ plugins/Unity/Launcher/CMakeLists.txt	2014-10-15 17:55:21 +0000
258
@@ -9,6 +9,7 @@
259
9
    ${CMAKE_CURRENT_SOURCE_DIR}
9
    ${CMAKE_CURRENT_SOURCE_DIR}
260
10
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
10
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
261
11
    ${GSETTINGS_QT_INCLUDE_DIRS}
11
    ${GSETTINGS_QT_INCLUDE_DIRS}
262
12
    ${libunity8-private_SOURCE_DIR}
263
12
)
13
)
264
13
14
265
14
set(QMLLAUNCHERPLUGIN_SRC
15
set(QMLLAUNCHERPLUGIN_SRC
266
@@ -30,7 +31,10 @@
267
30
    ${QMLLAUNCHERPLUGIN_SRC}
31
    ${QMLLAUNCHERPLUGIN_SRC}
268
31
    )
32
    )
269
32
33
271
33
target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})
34
target_link_libraries(UnityLauncher-qml
272
35
    unity8-private
273
36
    ${GSETTINGS_QT_LDFLAGS}
274
37
    )
275
34
38
276
35
qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
39
qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
277
36
40
278
37
41
279
=== modified file 'plugins/Unity/Launcher/dbusinterface.cpp'
280
--- plugins/Unity/Launcher/dbusinterface.cpp	2014-08-29 14:24:45 +0000
281
+++ plugins/Unity/Launcher/dbusinterface.cpp	2014-10-15 17:55:21 +0000
282
@@ -27,25 +27,13 @@
283
27
#include <QDebug>
27
#include <QDebug>
284
28
28
285
29
DBusInterface::DBusInterface(LauncherModel *parent):
29
DBusInterface::DBusInterface(LauncherModel *parent):
287
30
    QDBusVirtualObject(parent),
30
    UnityDBusVirtualObject("/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher", true, parent),
288
31
    m_launcherModel(parent)
31
    m_launcherModel(parent)
289
32
{
32
{
290
33
    /* Set up ourselves on DBus */
291
34
    QDBusConnection con = QDBusConnection::sessionBus();
292
35
    if (!con.registerService("com.canonical.Unity.Launcher")) {
293
36
        qWarning() << "Unable to register launcher name";
294
37
    }
295
38
    if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {
296
39
        qWarning() << "Unable to register launcher object";
297
40
    }
298
41
}
33
}
299
42
34
300
43
DBusInterface::~DBusInterface()
35
DBusInterface::~DBusInterface()
301
44
{
36
{
302
45
    /* Remove oursevles from DBus */
303
46
    QDBusConnection con = QDBusConnection::sessionBus();
304
47
    con.unregisterService("com.canonical.Unity.Launcher");
305
48
    con.unregisterObject("/com/canonical/Unity/Launcher");
306
49
}
37
}
307
50
38
308
51
QString DBusInterface::introspect(const QString &path) const
39
QString DBusInterface::introspect(const QString &path) const
309
@@ -186,13 +174,13 @@
310
186
            int newCount = message.arguments()[2].toInt();
174
            int newCount = message.arguments()[2].toInt();
311
187
            if (!item || newCount != item->count()) {
175
            if (!item || newCount != item->count()) {
312
188
                Q_EMIT countChanged(appid, newCount);
176
                Q_EMIT countChanged(appid, newCount);
314
189
                emitPropChangedDbus(appid, "count", QVariant(newCount));
177
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
315
190
            }
178
            }
316
191
        } else if (message.arguments()[1].toString() == "countVisible") {
179
        } else if (message.arguments()[1].toString() == "countVisible") {
317
192
            bool newVisible = message.arguments()[2].toBool();
180
            bool newVisible = message.arguments()[2].toBool();
318
193
            if (!item || newVisible != item->countVisible()) {
181
            if (!item || newVisible != item->countVisible()) {
319
194
                Q_EMIT countVisibleChanged(appid, newVisible);
182
                Q_EMIT countVisibleChanged(appid, newVisible);
321
195
                emitPropChangedDbus(appid, "countVisible", newVisible);
183
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
322
196
            }
184
            }
323
197
        }
185
        }
324
198
    } else if (message.member() == "GetAll") {
186
    } else if (message.member() == "GetAll") {
325
@@ -209,24 +197,3 @@
326
209
    QDBusMessage reply = message.createReply(retval);
197
    QDBusMessage reply = message.createReply(retval);
327
210
    return connection.send(reply);
198
    return connection.send(reply);
328
211
}
199
}
329
212
330
213
void DBusInterface::emitPropChangedDbus(const QString& appId, const QString& property, const QVariant &value)
331
214
{
332
215
    QString path("/com/canonical/Unity/Launcher/");
333
216
    path.append(encodeAppId(appId));
334
217
335
218
    QDBusMessage message = QDBusMessage::createSignal(path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
336
219
337
220
    QList<QVariant> arguments;
338
221
    QVariantHash changedprops;
339
222
    changedprops[property] = QVariant::fromValue(QDBusVariant(value));
340
223
    QVariantList deletedprops;
341
224
342
225
    arguments.append(changedprops);
343
226
    arguments.append(deletedprops);
344
227
345
228
    message.setArguments(arguments);
346
229
347
230
    QDBusConnection con = QDBusConnection::sessionBus();
348
231
    con.send(message);
349
232
}
350
233
200
351
=== modified file 'plugins/Unity/Launcher/dbusinterface.h'
352
--- plugins/Unity/Launcher/dbusinterface.h	2014-08-29 12:59:15 +0000
353
+++ plugins/Unity/Launcher/dbusinterface.h	2014-10-15 17:55:21 +0000
354
@@ -18,12 +18,11 @@
355
18
 */
18
 */
356
19
19
357
20
#include "launcheritem.h"
20
#include "launcheritem.h"
360
21
21
#include "unitydbusvirtualobject.h"
359
22
#include <QDBusVirtualObject>
361
23
22
362
24
class LauncherModel;
23
class LauncherModel;
363
25
24
365
26
class DBusInterface: public QDBusVirtualObject
25
class DBusInterface: public UnityDBusVirtualObject
366
27
{
26
{
367
28
    Q_OBJECT
27
    Q_OBJECT
368
29
public:
28
public:
369
@@ -43,8 +42,6 @@
370
43
    static QString decodeAppId(const QString& path);
42
    static QString decodeAppId(const QString& path);
371
44
    static QString encodeAppId(const QString& appId);
43
    static QString encodeAppId(const QString& appId);
372
45
44
373
46
    void emitPropChangedDbus(const QString& appId, const QString& property, const QVariant &value);
374
47
375
48
    LauncherModel *m_launcherModel;
45
    LauncherModel *m_launcherModel;
376
49
46
377
50
};
47
};
378
51
48
379
=== modified file 'plugins/Unity/Session/CMakeLists.txt'
380
--- plugins/Unity/Session/CMakeLists.txt	2014-08-26 23:33:17 +0000
381
+++ plugins/Unity/Session/CMakeLists.txt	2014-10-15 17:55:21 +0000
382
@@ -5,6 +5,7 @@
383
5
include_directories(
5
include_directories(
384
6
    ${CMAKE_CURRENT_SOURCE_DIR}
6
    ${CMAKE_CURRENT_SOURCE_DIR}
385
7
    ${GIO_INCLUDE_DIRS}
7
    ${GIO_INCLUDE_DIRS}
386
8
    ${libunity8-private_SOURCE_DIR}
387
8
)
9
)
388
9
10
389
10
set(QMLSESSIONPLUGIN_SRC
11
set(QMLSESSIONPLUGIN_SRC
390
@@ -18,7 +19,10 @@
391
18
    )
19
    )
392
19
20
393
20
qt5_use_modules(UnitySession-qml DBus Qml)
21
qt5_use_modules(UnitySession-qml DBus Qml)
395
21
target_link_libraries(UnitySession-qml ${GIO_LDFLAGS})
22
target_link_libraries(UnitySession-qml
396
23
    unity8-private
397
24
    ${GIO_LDFLAGS}
398
25
    )
399
22
26
400
23
# export the qmldir and qmltypes files
27
# export the qmldir and qmltypes files
401
24
add_unity8_plugin(Unity.Session 0.1 Unity/Session TARGETS UnitySession-qml)
28
add_unity8_plugin(Unity.Session 0.1 Unity/Session TARGETS UnitySession-qml)
402
25
29
403
=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
404
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2014-07-09 12:22:19 +0000
405
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2014-10-15 17:55:21 +0000
406
@@ -21,15 +21,9 @@
407
21
#include <QDBusConnection>
21
#include <QDBusConnection>
408
22
#include <QDBusInterface>
22
#include <QDBusInterface>
409
23
23
411
24
DBusUnitySessionService::DBusUnitySessionService() : QObject()
24
DBusUnitySessionService::DBusUnitySessionService()
412
25
    : UnityDBusObject("/com/canonical/Unity/Session", "com.canonical.Unity")
413
25
{
26
{
414
26
    QDBusConnection connection = QDBusConnection::sessionBus();
415
27
416
28
    connection.registerService("com.canonical.Unity");
417
29
    connection.registerObject("/com/canonical/Unity/Session", this,
418
30
                              QDBusConnection::ExportScriptableSignals
419
31
                              | QDBusConnection::ExportScriptableSlots
420
32
                              | QDBusConnection::ExportScriptableInvokables);
421
33
}
27
}
422
34
28
423
35
DBusUnitySessionService::~DBusUnitySessionService()
29
DBusUnitySessionService::~DBusUnitySessionService()
424
36
30
425
=== modified file 'plugins/Unity/Session/dbusunitysessionservice.h'
426
--- plugins/Unity/Session/dbusunitysessionservice.h	2014-05-27 15:43:52 +0000
427
+++ plugins/Unity/Session/dbusunitysessionservice.h	2014-10-15 17:55:21 +0000
428
@@ -17,7 +17,7 @@
429
17
#ifndef DBUSUNITYSESSIONSERVICE_H
17
#ifndef DBUSUNITYSESSIONSERVICE_H
430
18
#define DBUSUNITYSESSIONSERVICE_H
18
#define DBUSUNITYSESSIONSERVICE_H
431
19
19
433
20
#include <QObject>
20
#include "unitydbusobject.h"
434
21
21
435
22
/**
22
/**
436
23
 * DBusUnitySessionService provides com.canonical.Unity.Session dbus
23
 * DBusUnitySessionService provides com.canonical.Unity.Session dbus
437
@@ -26,7 +26,7 @@
438
26
 * com.canonical.Unity.Session interface provides public methods
26
 * com.canonical.Unity.Session interface provides public methods
439
27
 * and signals to handle Logout/Reboot/Shutdown.
27
 * and signals to handle Logout/Reboot/Shutdown.
440
28
 */
28
 */
442
29
class DBusUnitySessionService : public QObject
29
class DBusUnitySessionService : public UnityDBusObject
443
30
{
30
{
444
31
    Q_OBJECT
31
    Q_OBJECT
445
32
    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.Session")
32
    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.Session")
446
33
33
447
=== modified file 'qml/Shell.qml'
448
--- qml/Shell.qml	2014-10-13 15:41:29 +0000
449
+++ qml/Shell.qml	2014-10-15 17:55:21 +0000
450
@@ -370,6 +370,10 @@
451
370
        onHideGreeter: greeter.login()
370
        onHideGreeter: greeter.login()
452
371
371
453
372
        onShowPrompt: {
372
        onShowPrompt: {
454
373
            shell.enabled = true;
455
374
            if (!LightDM.Greeter.active) {
456
375
                return; // could happen if hideGreeter() comes in before we prompt
457
376
            }
458
373
            if (greeter.narrowMode) {
377
            if (greeter.narrowMode) {
459
374
                if (isDefaultPrompt) {
378
                if (isDefaultPrompt) {
460
375
                    if (lockscreen.alphaNumeric) {
379
                    if (lockscreen.alphaNumeric) {
461
@@ -390,6 +394,9 @@
462
390
        }
394
        }
463
391
395
464
392
        onPromptlessChanged: {
396
        onPromptlessChanged: {
465
397
            if (!LightDM.Greeter.active) {
466
398
                return; // could happen if hideGreeter() comes in before we prompt
467
399
            }
468
393
            if (greeter.narrowMode) {
400
            if (greeter.narrowMode) {
469
394
                if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
401
                if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
470
395
                    lockscreen.hide()
402
                    lockscreen.hide()
471
@@ -401,6 +408,7 @@
472
401
        }
408
        }
473
402
409
474
403
        onAuthenticationComplete: {
410
        onAuthenticationComplete: {
475
411
            shell.enabled = true;
476
404
            if (LightDM.Greeter.authenticated) {
412
            if (LightDM.Greeter.authenticated) {
477
405
                AccountsService.failedLogins = 0
413
                AccountsService.failedLogins = 0
478
406
            }
414
            }
479
@@ -537,6 +545,11 @@
480
537
545
481
538
            onShownChanged: {
546
            onShownChanged: {
482
539
                if (shown) {
547
                if (shown) {
483
548
                    // Disable everything so that user can't swipe greeter or
484
549
                    // launcher until we get first prompt/authenticate, which
485
550
                    // will re-enable the shell.
486
551
                    shell.enabled = false;
487
552
488
540
                    if (greeter.narrowMode) {
553
                    if (greeter.narrowMode) {
489
541
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
554
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
490
542
                    } else {
555
                    } else {
491
543
556
492
=== modified file 'src/libunity8-private/CMakeLists.txt'
493
--- src/libunity8-private/CMakeLists.txt	2014-09-05 11:57:01 +0000
494
+++ src/libunity8-private/CMakeLists.txt	2014-10-15 17:55:21 +0000
495
@@ -6,6 +6,8 @@
496
6
6
497
7
set(lib${LIB_NAME}_SRCS
7
set(lib${LIB_NAME}_SRCS
498
8
    abstractdbusservicemonitor.cpp
8
    abstractdbusservicemonitor.cpp
499
9
    unitydbusobject.cpp
500
10
    unitydbusvirtualobject.cpp
501
9
    )
11
    )
502
10
12
503
11
add_library(${LIB_NAME} SHARED
13
add_library(${LIB_NAME} SHARED
504
12
14
505
=== added file 'src/libunity8-private/unitydbusobject.cpp'
506
--- src/libunity8-private/unitydbusobject.cpp	1970-01-01 00:00:00 +0000
507
+++ src/libunity8-private/unitydbusobject.cpp	2014-10-15 17:55:21 +0000
508
@@ -0,0 +1,86 @@
509
1
/*
510
2
 * Copyright (C) 2014 Canonical, Ltd.
511
3
 *
512
4
 * This program is free software; you can redistribute it and/or modify
513
5
 * it under the terms of the GNU General Public License as published by
514
6
 * the Free Software Foundation; version 3.
515
7
 *
516
8
 * This program is distributed in the hope that it will be useful,
517
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
518
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
519
11
 * GNU General Public License for more details.
520
12
 *
521
13
 * You should have received a copy of the GNU General Public License
522
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
523
15
 */
524
16
525
17
#include "unitydbusobject.h"
526
18
527
19
#include <QDebug>
528
20
#include <QDBusMessage>
529
21
#include <QMetaClassInfo>
530
22
#include <QTimer>
531
23
532
24
UnityDBusObject::UnityDBusObject(const QString &path, const QString &service, bool async, QObject *parent)
533
25
    : QObject(parent)
534
26
    , m_connection(QDBusConnection::sessionBus())
535
27
    , m_path(path)
536
28
    , m_service(service)
537
29
{
538
30
    if (async) {
539
31
        // Use a zero-timer to let Qml finish loading before we announce on DBus
540
32
        QTimer::singleShot(0, this, SLOT(registerObject()));
541
33
    } else {
542
34
        registerObject();
543
35
    }
544
36
}
545
37
546
38
UnityDBusObject::~UnityDBusObject()
547
39
{
548
40
    // Leave service in place because multiple objects may be registered with
549
41
    // the same service.  But we know we own the object path and can unregister it.
550
42
    m_connection.unregisterObject(path());
551
43
}
552
44
553
45
QDBusConnection UnityDBusObject::connection() const
554
46
{
555
47
    return m_connection;
556
48
}
557
49
558
50
QString UnityDBusObject::path() const
559
51
{
560
52
    return m_path;
561
53
}
562
54
563
55
// Manually emit a PropertiesChanged signal over DBus, because QtDBus
564
56
// doesn't do it for us on Q_PROPERTIES, oddly enough.
565
57
void UnityDBusObject::notifyPropertyChanged(const QString& propertyName, const QVariant &value)
566
58
{
567
59
    QDBusMessage message;
568
60
    QString interface;
569
61
    QVariantMap changedProps;
570
62
571
63
    interface = metaObject()->classInfo(metaObject()->indexOfClassInfo("D-Bus Interface")).value();
572
64
    changedProps.insert(propertyName, value);
573
65
574
66
    message = QDBusMessage::createSignal(path(),
575
67
                                         "org.freedesktop.DBus.Properties",
576
68
                                         "PropertiesChanged");
577
69
    message << interface;
578
70
    message << changedProps;
579
71
    message << QStringList();
580
72
581
73
    connection().send(message);
582
74
}
583
75
584
76
void UnityDBusObject::registerObject()
585
77
{
586
78
    if (!m_connection.registerObject(m_path, this, QDBusConnection::ExportScriptableContents)) {
587
79
        qWarning() << "Unable to register DBus object" << m_path;
588
80
    }
589
81
    if (!m_service.isEmpty()) {
590
82
        if (!m_connection.registerService(m_service)) {
591
83
            qWarning() << "Unable to register DBus service" << m_service;
592
84
        }
593
85
    }
594
86
}
595
0
87
596
=== added file 'src/libunity8-private/unitydbusobject.h'
597
--- src/libunity8-private/unitydbusobject.h	1970-01-01 00:00:00 +0000
598
+++ src/libunity8-private/unitydbusobject.h	2014-10-15 17:55:21 +0000
599
@@ -0,0 +1,46 @@
600
1
/*
601
2
 * Copyright (C) 2014 Canonical, Ltd.
602
3
 *
603
4
 * This program is free software; you can redistribute it and/or modify
604
5
 * it under the terms of the GNU General Public License as published by
605
6
 * the Free Software Foundation; version 3.
606
7
 *
607
8
 * This program is distributed in the hope that it will be useful,
608
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
609
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
610
11
 * GNU General Public License for more details.
611
12
 *
612
13
 * You should have received a copy of the GNU General Public License
613
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
614
15
 */
615
16
616
17
#ifndef UNITYDBUSOBJECT_H
617
18
#define UNITYDBUSOBJECT_H
618
19
619
20
#include <QDBusConnection>
620
21
#include <QObject>
621
22
622
23
class Q_DECL_EXPORT UnityDBusObject : public QObject
623
24
{
624
25
    Q_OBJECT
625
26
626
27
public:
627
28
    explicit UnityDBusObject(const QString &path, const QString &service = QString(), bool async = true, QObject *parent = 0);
628
29
    ~UnityDBusObject();
629
30
630
31
    QDBusConnection connection() const;
631
32
    QString path() const;
632
33
633
34
protected:
634
35
    void notifyPropertyChanged(const QString& propertyName, const QVariant &value);
635
36
636
37
private Q_SLOTS:
637
38
    void registerObject();
638
39
639
40
private:
640
41
    QDBusConnection m_connection;
641
42
    QString m_path;
642
43
    QString m_service;
643
44
};
644
45
645
46
#endif // UNITYDBUSOBJECT_H
646
0
47
647
=== added file 'src/libunity8-private/unitydbusvirtualobject.cpp'
648
--- src/libunity8-private/unitydbusvirtualobject.cpp	1970-01-01 00:00:00 +0000
649
+++ src/libunity8-private/unitydbusvirtualobject.cpp	2014-10-15 17:55:21 +0000
650
@@ -0,0 +1,83 @@
651
1
/*
652
2
 * Copyright (C) 2014 Canonical, Ltd.
653
3
 *
654
4
 * This program is free software; you can redistribute it and/or modify
655
5
 * it under the terms of the GNU General Public License as published by
656
6
 * the Free Software Foundation; version 3.
657
7
 *
658
8
 * This program is distributed in the hope that it will be useful,
659
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
660
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
661
11
 * GNU General Public License for more details.
662
12
 *
663
13
 * You should have received a copy of the GNU General Public License
664
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
665
15
 */
666
16
667
17
#include "unitydbusvirtualobject.h"
668
18
669
19
#include <QDebug>
670
20
#include <QDBusMessage>
671
21
#include <QTimer>
672
22
673
23
UnityDBusVirtualObject::UnityDBusVirtualObject(const QString &path, const QString &service, bool async, QObject *parent)
674
24
    : QDBusVirtualObject(parent)
675
25
    , m_connection(QDBusConnection::sessionBus())
676
26
    , m_path(path)
677
27
    , m_service(service)
678
28
{
679
29
    if (async) {
680
30
        // Use a zero-timer to let Qml finish loading before we announce on DBus
681
31
        QTimer::singleShot(0, this, SLOT(registerObject()));
682
32
    } else {
683
33
        registerObject();
684
34
    }
685
35
}
686
36
687
37
UnityDBusVirtualObject::~UnityDBusVirtualObject()
688
38
{
689
39
    // Leave service in place because multiple objects may be registered with
690
40
    // the same service.  But we know we own the object path and can unregister it.
691
41
    m_connection.unregisterObject(path());
692
42
}
693
43
694
44
QDBusConnection UnityDBusVirtualObject::connection() const
695
45
{
696
46
    return m_connection;
697
47
}
698
48
699
49
QString UnityDBusVirtualObject::path() const
700
50
{
701
51
    return m_path;
702
52
}
703
53
704
54
// Manually emit a PropertiesChanged signal over DBus, because QtDBus
705
55
// doesn't do it for us on Q_PROPERTIES, oddly enough.
706
56
void UnityDBusVirtualObject::notifyPropertyChanged(const QString& interface, const QString& node, const QString& propertyName, const QVariant &value)
707
57
{
708
58
    QDBusMessage message;
709
59
    QVariantMap changedProps;
710
60
711
61
    changedProps.insert(propertyName, value);
712
62
713
63
    message = QDBusMessage::createSignal(path() + "/" + node,
714
64
                                         "org.freedesktop.DBus.Properties",
715
65
                                         "PropertiesChanged");
716
66
    message << interface;
717
67
    message << changedProps;
718
68
    message << QStringList();
719
69
720
70
    connection().send(message);
721
71
}
722
72
723
73
void UnityDBusVirtualObject::registerObject()
724
74
{
725
75
    if (!m_connection.registerVirtualObject(m_path, this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {
726
76
        qWarning() << "Unable to register DBus object" << m_path;
727
77
    }
728
78
    if (!m_service.isEmpty()) {
729
79
        if (!m_connection.registerService(m_service)) {
730
80
            qWarning() << "Unable to register DBus service" << m_service;
731
81
        }
732
82
    }
733
83
}
734
0
84
735
=== added file 'src/libunity8-private/unitydbusvirtualobject.h'
736
--- src/libunity8-private/unitydbusvirtualobject.h	1970-01-01 00:00:00 +0000
737
+++ src/libunity8-private/unitydbusvirtualobject.h	2014-10-15 17:55:21 +0000
738
@@ -0,0 +1,47 @@
739
1
/*
740
2
 * Copyright (C) 2014 Canonical, Ltd.
741
3
 *
742
4
 * This program is free software; you can redistribute it and/or modify
743
5
 * it under the terms of the GNU General Public License as published by
744
6
 * the Free Software Foundation; version 3.
745
7
 *
746
8
 * This program is distributed in the hope that it will be useful,
747
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
748
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
749
11
 * GNU General Public License for more details.
750
12
 *
751
13
 * You should have received a copy of the GNU General Public License
752
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
753
15
 */
754
16
755
17
#ifndef UNITYDBUSVIRTUALOBJECT_H
756
18
#define UNITYDBUSVIRTUALOBJECT_H
757
19
758
20
#include <QDBusConnection>
759
21
#include <QDBusVirtualObject>
760
22
#include <QObject>
761
23
762
24
class Q_DECL_EXPORT UnityDBusVirtualObject : public QDBusVirtualObject
763
25
{
764
26
    Q_OBJECT
765
27
766
28
public:
767
29
    explicit UnityDBusVirtualObject(const QString &path, const QString &service = QString(), bool async = true, QObject *parent = 0);
768
30
    ~UnityDBusVirtualObject();
769
31
770
32
    QDBusConnection connection() const;
771
33
    QString path() const;
772
34
773
35
protected:
774
36
    void notifyPropertyChanged(const QString& interface, const QString& node, const QString& propertyName, const QVariant &value);
775
37
776
38
private Q_SLOTS:
777
39
    void registerObject();
778
40
779
41
private:
780
42
    QDBusConnection m_connection;
781
43
    QString m_path;
782
44
    QString m_service;
783
45
};
784
46
785
47
#endif // UNITYDBUSVIRTUALOBJECT_H
786
0
48
787
=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
788
--- tests/mocks/LightDM/CMakeLists.txt	2014-06-18 17:26:30 +0000
789
+++ tests/mocks/LightDM/CMakeLists.txt	2014-10-15 17:55:21 +0000
790
@@ -15,6 +15,7 @@
791
15
    ${CMAKE_CURRENT_BINARY_DIR}
15
    ${CMAKE_CURRENT_BINARY_DIR}
792
16
    ${CMAKE_SOURCE_DIR}/plugins/Utils
16
    ${CMAKE_SOURCE_DIR}/plugins/Utils
793
17
    ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
17
    ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
794
18
    ${libunity8-private_SOURCE_DIR}
795
18
)
19
)
796
19
20
797
20
set(QMLPLUGIN_SRC
21
set(QMLPLUGIN_SRC
798
@@ -40,6 +41,7 @@
799
40
    -llightdm-qt5-2
41
    -llightdm-qt5-2
800
41
    -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
42
    -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
801
42
    -lusermetricsoutput
43
    -lusermetricsoutput
802
44
    unity8-private
803
43
    )
45
    )
804
44
46
805
45
qt5_use_modules(MockLightDM-qml DBus Gui Qml)
47
qt5_use_modules(MockLightDM-qml DBus Gui Qml)
806
46
48
807
=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
808
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2014-09-29 09:43:18 +0000
809
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2014-10-15 17:55:21 +0000
810
@@ -7,6 +7,7 @@
811
7
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
7
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
812
8
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher
8
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher
813
9
    ${GSETTINGS_QT_INCLUDE_DIRS}
9
    ${GSETTINGS_QT_INCLUDE_DIRS}
814
10
    ${libunity8-private_SOURCE_DIR}
815
10
    )
11
    )
816
11
12
817
12
add_definitions(-DSM_BUSNAME=sessionBus)
13
add_definitions(-DSM_BUSNAME=sessionBus)
818
@@ -34,7 +35,10 @@
819
34
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
35
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
820
35
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
36
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
821
36
    )
37
    )
823
37
target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})
38
target_link_libraries(launchermodeltestExec
824
39
    unity8-private
825
40
    ${GSETTINGS_QT_LDFLAGS}
826
41
    )
827
38
qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui)
42
qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui)
828
39
43
829
40
# copy .desktop files into build directory for shadow builds
44
# copy .desktop files into build directory for shadow builds
830
41
45
831
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
832
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-09-29 14:26:56 +0000
833
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-10-15 17:55:21 +0000
834
@@ -124,6 +124,7 @@
835
124
124
836
125
    void initTestCase() {
125
    void initTestCase() {
837
126
        launcherModel = new LauncherModel(this);
126
        launcherModel = new LauncherModel(this);
838
127
        QCoreApplication::processEvents(); // to let the model register on DBus
839
127
        QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);
128
        QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);
840
128
129
841
129
        appManager = new MockAppManager(this);
130
        appManager = new MockAppManager(this);
842
130
131
843
=== modified file 'tests/plugins/Unity/Session/CMakeLists.txt'
844
--- tests/plugins/Unity/Session/CMakeLists.txt	2014-06-13 12:45:12 +0000
845
+++ tests/plugins/Unity/Session/CMakeLists.txt	2014-10-15 17:55:21 +0000
846
@@ -1,6 +1,7 @@
847
1
include_directories(
1
include_directories(
848
2
    ${CMAKE_CURRENT_BINARY_DIR}
2
    ${CMAKE_CURRENT_BINARY_DIR}
849
3
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Session
3
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Session
850
4
    ${libunity8-private_SOURCE_DIR}
851
4
)
5
)
852
5
6
853
6
add_definitions(-DSM_BUSNAME=sessionBus)
7
add_definitions(-DSM_BUSNAME=sessionBus)
854
@@ -17,4 +18,7 @@
855
17
    sessionbackendtest.cpp
18
    sessionbackendtest.cpp
856
18
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Session/dbusunitysessionservice.cpp
19
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Session/dbusunitysessionservice.cpp
857
19
)
20
)
858
21
target_link_libraries(sessionbackendtestExec
859
22
    unity8-private
860
23
    )
861
20
qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)
24
qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)
862
21
25
863
=== modified file 'tests/plugins/Unity/Session/sessionbackendtest.cpp'
864
--- tests/plugins/Unity/Session/sessionbackendtest.cpp	2014-05-29 08:23:37 +0000
865
+++ tests/plugins/Unity/Session/sessionbackendtest.cpp	2014-10-15 17:55:21 +0000
866
@@ -45,6 +45,7 @@
867
45
        QFETCH(QString, method);
45
        QFETCH(QString, method);
868
46
46
869
47
        DBusUnitySessionService dbusUnitySessionService;
47
        DBusUnitySessionService dbusUnitySessionService;
870
48
        QCoreApplication::processEvents(); // to let the service register on DBus
871
48
49
872
49
        QDBusConnection con = QDBusConnection::sessionBus();
50
        QDBusConnection con = QDBusConnection::sessionBus();
873
50
        QDBusInterface interface ("com.canonical.Unity",
51
        QDBusInterface interface ("com.canonical.Unity",
874
51
52
875
=== modified file 'tests/qmltests/tst_Shell.qml'
876
--- tests/qmltests/tst_Shell.qml	2014-10-13 15:42:40 +0000
877
+++ tests/qmltests/tst_Shell.qml	2014-10-15 17:55:21 +0000
878
@@ -132,6 +132,8 @@
879
132
        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
132
        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
880
133
133
881
134
        function init() {
134
        function init() {
882
135
            tryCompare(shell, "enabled", true); // enabled by greeter when ready
883
136
884
135
            swipeAwayGreeter();
137
            swipeAwayGreeter();
885
136
138
886
137
            sessionSpy.target = findChild(shell, "greeter")
139
            sessionSpy.target = findChild(shell, "greeter")
887
@@ -142,6 +144,7 @@
888
142
        }
144
        }
889
143
145
890
144
        function cleanup() {
146
        function cleanup() {
891
147
            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
892
145
            launcherShowDashHomeSpy.target = null;
148
            launcherShowDashHomeSpy.target = null;
893
146
149
894
147
            shellLoader.itemDestroyed = false;
150
            shellLoader.itemDestroyed = false;
895
148
151
896
=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
897
--- tests/qmltests/tst_ShellWithPin.qml	2014-10-13 15:42:15 +0000
898
+++ tests/qmltests/tst_ShellWithPin.qml	2014-10-15 17:55:21 +0000
899
@@ -127,6 +127,7 @@
900
127
        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
127
        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
901
128
128
902
129
        function init() {
129
        function init() {
903
130
            tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
904
130
            sessionSpy.target = findChild(shell, "greeter")
131
            sessionSpy.target = findChild(shell, "greeter")
905
131
            swipeAwayGreeter()
132
            swipeAwayGreeter()
906
132
            waitForLockscreen()
133
            waitForLockscreen()
907
@@ -135,6 +136,8 @@
908
135
        }
136
        }
909
136
137
910
137
        function cleanup() {
138
        function cleanup() {
911
139
            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
912
140
913
138
            shellLoader.itemDestroyed = false
141
            shellLoader.itemDestroyed = false
914
139
142
915
140
            shellLoader.active = false
143
            shellLoader.active = false
916
141
144
917
=== modified file 'tests/qmltests/tst_TabletShell.qml'
918
--- tests/qmltests/tst_TabletShell.qml	2014-10-09 13:05:21 +0000
919
+++ tests/qmltests/tst_TabletShell.qml	2014-10-15 17:55:21 +0000
920
@@ -119,12 +119,15 @@
921
119
        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
119
        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
922
120
120
923
121
        function init() {
121
        function init() {
924
122
            tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
925
122
            sessionSpy.clear()
123
            sessionSpy.clear()
926
123
            sessionSpy.target = findChild(shell, "greeter")
124
            sessionSpy.target = findChild(shell, "greeter")
927
124
            dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator")
125
            dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator")
928
125
        }
126
        }
929
126
127
930
127
        function cleanup() {
128
        function cleanup() {
931
129
            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
932
130
933
128
            shellLoader.itemDestroyed = false
131
            shellLoader.itemDestroyed = false
934
129
132
935
130
            shellLoader.active = false
133
            shellLoader.active = false
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-10-20
Michael Zanetti (community)		2014-10-08	Approve on 2014-10-15
Unity Team		2014-10-10	Pending
Review via email: mp+237594@code.launchpad.net