git.iko.soy/unity8
on xenial help sign in
Adjust to new UGSB api
commit8e9a17617010da45b723985e817a457ff50d9890 authorMichael Terry <michael.terry@canonical.com> dateWed 19 Mar 2014, 17:06 (13 years ago) parent37dc525
3 files changed+11−11
compare with xenial
unifiedsplit
plugins/SessionBroadcast/SessionBroadcast.cpp+6−6 plugins/SessionBroadcast/SessionBroadcast.h+3−3 qml/GreeterShell.qml+2−2
plugins/SessionBroadcast/SessionBroadcast.cpp+6−6
@@ -36,9 +36,9 @@ SessionBroadcast::SessionBroadcast(QObject* parent)
3636 connection.connect("com.canonical.Unity.Greeter.Broadcast",
3737 "/com/canonical/Unity/Greeter/Broadcast",
3838 "com.canonical.Unity.Greeter.Broadcast",
39− "StartApplication",
39+ "StartUrl",
4040 this,
41− SLOT(onStartApplication(const QString &, const QString &)));
41+ SLOT(onStartUrl(const QString &, const QString &)));
4242
4343 connection.connect("com.canonical.Unity.Greeter.Broadcast",
4444 "/com/canonical/Unity/Greeter/Broadcast",
@@ -48,18 +48,18 @@ SessionBroadcast::SessionBroadcast(QObject* parent)
4848 SLOT(onShowHome(const QString &)));
4949}
5050
51−void SessionBroadcast::requestApplicationStart(const QString &username, const QString &appId)
51+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
5252{
53− m_broadcaster->asyncCall("RequestApplicationStart", username, appId);
53+ m_broadcaster->asyncCall("RequestUrlStart", username, url);
5454}
5555
56−void SessionBroadcast::onStartApplication(const QString &username, const QString &appId)
56+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
5757{
5858 // Since this signal is just used for testing, we don't *really* care if
5959 // username matches, but just in case we do eventually use the signal, we
6060 // should only listen to our own requests.
6161 if (username == qgetenv("USER")) {
62− Q_EMIT startApplication(appId);
62+ Q_EMIT startUrl(url);
6363 }
6464}
6565
plugins/SessionBroadcast/SessionBroadcast.h+3−3
@@ -31,17 +31,17 @@ class SessionBroadcast: public QObject
3131public:
3232 explicit SessionBroadcast(QObject *parent = 0);
3333
34− Q_INVOKABLE void requestApplicationStart(const QString &username, const QString &appId);
34+ Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
3535
3636Q_SIGNALS:
3737 // This signal isn't actually used by the shell
3838 // (unity-greeter-session-broadcast handles launching an app for us), but
3939 // it's useful for testing the plugin.
40− void startApplication(const QString &appId);
40+ void startUrl(const QString &url);
4141 void showHome();
4242
4343private Q_SLOTS:
44− void onStartApplication(const QString &username, const QString &appId);
44+ void onStartUrl(const QString &username, const QString &url);
4545 void onShowHome(const QString &username);
4646
4747private:
qml/GreeterShell.qml+2−2
@@ -34,7 +34,7 @@ BasicShell {
3434 id: shell
3535
3636 function activateApplication(appId) {
37− SessionBroadcast.requestApplicationStart(LightDM.Greeter.authenticationUser, appId)
37+ SessionBroadcast.requestUrlStart(LightDM.Greeter.authenticationUser, appId)
3838 greeter.hide()
3939 }
4040
@@ -191,7 +191,7 @@ BasicShell {
191191 dragAreaWidth: shell.edgeSize
192192 available: greeter.narrowMode && !edgeDemo.active
193193 onLauncherApplicationSelected: {
194− shell.activateApplication(appId)
194+ shell.activateApplication("application:///" + appId + ".desktop")
195195 }
196196 onShownChanged: {
197197 if (shown) {