git.iko.soy/unity8
on xenial help sign in
fix case mismatch in session service signals

apparently QML is picky on upper/lowercase signal names

commit2a3a2ac2d812ce01b6dced39bcff19bd8478a76c authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 27 Jul 2015, 16:38 (11 years ago) parent39aae47
2 files changed+10
compare with xenial
unifiedsplit
plugins/Unity/Session/dbusunitysessionservice.cpp+5 plugins/Unity/Session/dbusunitysessionservice.h+5
plugins/Unity/Session/dbusunitysessionservice.cpp+5
@@ -197,6 +197,7 @@ void DBusUnitySessionService::Logout()
197197{
198198 // TODO ask the apps to quit and then emit the signal
199199 Q_EMIT LogoutReady();
200+ Q_EMIT logoutReady();
200201}
201202
202203void DBusUnitySessionService::EndSession()
@@ -275,6 +276,7 @@ QString DBusUnitySessionService::HostName() const
275276void DBusUnitySessionService::PromptLock()
276277{
277278 Q_EMIT LockRequested();
279+ Q_EMIT lockRequested();
278280}
279281
280282void DBusUnitySessionService::Lock()
@@ -303,6 +305,7 @@ bool DBusUnitySessionService::IsLocked() const
303305void DBusUnitySessionService::RequestLogout()
304306{
305307 Q_EMIT LogoutRequested(false);
308+ Q_EMIT logoutRequested(false);
306309}
307310
308311void DBusUnitySessionService::Reboot()
@@ -313,6 +316,7 @@ void DBusUnitySessionService::Reboot()
313316void DBusUnitySessionService::RequestReboot()
314317{
315318 Q_EMIT RebootRequested(false);
319+ Q_EMIT rebootRequested(false);
316320}
317321
318322void DBusUnitySessionService::Shutdown()
@@ -338,6 +342,7 @@ void DBusUnitySessionService::HybridSleep()
338342void DBusUnitySessionService::RequestShutdown()
339343{
340344 Q_EMIT ShutdownRequested(false);
345+ Q_EMIT shutdownRequested(false);
341346}
342347
343348enum class Action : unsigned
plugins/Unity/Session/dbusunitysessionservice.h+5
@@ -56,6 +56,7 @@ Q_SIGNALS:
5656 * which inhibit the logout.
5757 */
5858 Q_SCRIPTABLE void LogoutRequested(bool have_inhibitors);
59+ void logoutRequested(bool have_inhibitors);
5960
6061 /**
6162 * RebootRequested signal
@@ -66,6 +67,7 @@ Q_SIGNALS:
6667 * which inhibit the reboot.
6768 */
6869 Q_SCRIPTABLE void RebootRequested(bool have_inhibitors);
70+ void rebootRequested(bool have_inhibitors);
6971
7072 /**
7173 * ShutdownRequested signal
@@ -76,6 +78,7 @@ Q_SIGNALS:
7678 * which inhibit the shutdown.
7779 */
7880 Q_SCRIPTABLE void ShutdownRequested(bool have_inhibitors);
81+ void shutdownRequested(bool have_inhibitors);
7982
8083 /**
8184 * LogoutReady signal
@@ -84,11 +87,13 @@ Q_SIGNALS:
8487 * is safe to logout.
8588 */
8689 Q_SCRIPTABLE void LogoutReady();
90+ void logoutReady();
8791
8892 /**
8993 * Emitted as a result of calling PromptLock()
9094 */
9195 Q_SCRIPTABLE void LockRequested();
96+ void lockRequested();
9297
9398 /**
9499 * Emitted after the session has been locked.