git.iko.soy/unity8
on xenial help sign in
Adjust to new UGSB api
8e9a176Michael Terry
plugins/SessionBroadcast/SessionBroadcast.cpp+6−6
compare with xenial
unifiedsplit
@@ -36,9 +36,9 @@ SessionBroadcast::SessionBroadcast(QObject* parent)
36 connection.connect("com.canonical.Unity.Greeter.Broadcast",
36 connection.connect("com.canonical.Unity.Greeter.Broadcast",
37 "/com/canonical/Unity/Greeter/Broadcast",
37 "/com/canonical/Unity/Greeter/Broadcast",
38 "com.canonical.Unity.Greeter.Broadcast",
38 "com.canonical.Unity.Greeter.Broadcast",
39− "StartApplication",
39+ "StartUrl",
40 this,
40 this,
41− SLOT(onStartApplication(const QString &, const QString &)));
41+ SLOT(onStartUrl(const QString &, const QString &)));
42
42
43 connection.connect("com.canonical.Unity.Greeter.Broadcast",
43 connection.connect("com.canonical.Unity.Greeter.Broadcast",
44 "/com/canonical/Unity/Greeter/Broadcast",
44 "/com/canonical/Unity/Greeter/Broadcast",
@@ -48,18 +48,18 @@ SessionBroadcast::SessionBroadcast(QObject* parent)
48 SLOT(onShowHome(const QString &)));
48 SLOT(onShowHome(const QString &)));
49}
49}
50
50
51−void SessionBroadcast::requestApplicationStart(const QString &username, const QString &appId)
51+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
52{
52{
53− m_broadcaster->asyncCall("RequestApplicationStart", username, appId);
53+ m_broadcaster->asyncCall("RequestUrlStart", username, url);
54}
54}
55
55
56−void SessionBroadcast::onStartApplication(const QString &username, const QString &appId)
56+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
57{
57{
58 // Since this signal is just used for testing, we don't *really* care if
58 // Since this signal is just used for testing, we don't *really* care if
59 // username matches, but just in case we do eventually use the signal, we
59 // username matches, but just in case we do eventually use the signal, we
60 // should only listen to our own requests.
60 // should only listen to our own requests.
61 if (username == qgetenv("USER")) {
61 if (username == qgetenv("USER")) {
62− Q_EMIT startApplication(appId);
62+ Q_EMIT startUrl(url);
63 }
63 }
64}
64}
65
65
plugins/SessionBroadcast/SessionBroadcast.h+3−3
@@ -31,17 +31,17 @@ class SessionBroadcast: public QObject
31public:
31public:
32 explicit SessionBroadcast(QObject *parent = 0);
32 explicit SessionBroadcast(QObject *parent = 0);
33
33
34− Q_INVOKABLE void requestApplicationStart(const QString &username, const QString &appId);
34+ Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
35
35
36Q_SIGNALS:
36Q_SIGNALS:
37 // This signal isn't actually used by the shell
37 // This signal isn't actually used by the shell
38 // (unity-greeter-session-broadcast handles launching an app for us), but
38 // (unity-greeter-session-broadcast handles launching an app for us), but
39 // it's useful for testing the plugin.
39 // it's useful for testing the plugin.
40− void startApplication(const QString &appId);
40+ void startUrl(const QString &url);
41 void showHome();
41 void showHome();
42
42
43private Q_SLOTS:
43private Q_SLOTS:
44− void onStartApplication(const QString &username, const QString &appId);
44+ void onStartUrl(const QString &username, const QString &url);
45 void onShowHome(const QString &username);
45 void onShowHome(const QString &username);
46
46
47private:
47private:
qml/GreeterShell.qml+2−2
@@ -34,7 +34,7 @@ BasicShell {
34 id: shell
34 id: shell
35
35
36 function activateApplication(appId) {
36 function activateApplication(appId) {
37− SessionBroadcast.requestApplicationStart(LightDM.Greeter.authenticationUser, appId)
37+ SessionBroadcast.requestUrlStart(LightDM.Greeter.authenticationUser, appId)
38 greeter.hide()
38 greeter.hide()
39 }
39 }
40
40
@@ -191,7 +191,7 @@ BasicShell {
191 dragAreaWidth: shell.edgeSize
191 dragAreaWidth: shell.edgeSize
192 available: greeter.narrowMode && !edgeDemo.active
192 available: greeter.narrowMode && !edgeDemo.active
193 onLauncherApplicationSelected: {
193 onLauncherApplicationSelected: {
194− shell.activateApplication(appId)
194+ shell.activateApplication("application:///" + appId + ".desktop")
195 }
195 }
196 onShownChanged: {
196 onShownChanged: {
197 if (shown) {
197 if (shown) {