git.iko.soy/unity8
on xenial help sign in
fix case mismatch in session service signals
2a3a2acLukáš Tinkl
plugins/Unity/Session/dbusunitysessionservice.cpp+5
compare with xenial
unifiedsplit
@@ -197,6 +197,7 @@ void DBusUnitySessionService::Logout()
197{
197{
198 // TODO ask the apps to quit and then emit the signal
198 // TODO ask the apps to quit and then emit the signal
199 Q_EMIT LogoutReady();
199 Q_EMIT LogoutReady();
200+ Q_EMIT logoutReady();
200}
201}
201
202
202void DBusUnitySessionService::EndSession()
203void DBusUnitySessionService::EndSession()
@@ -275,6 +276,7 @@ QString DBusUnitySessionService::HostName() const
275void DBusUnitySessionService::PromptLock()
276void DBusUnitySessionService::PromptLock()
276{
277{
277 Q_EMIT LockRequested();
278 Q_EMIT LockRequested();
279+ Q_EMIT lockRequested();
278}
280}
279
281
280void DBusUnitySessionService::Lock()
282void DBusUnitySessionService::Lock()
@@ -303,6 +305,7 @@ bool DBusUnitySessionService::IsLocked() const
303void DBusUnitySessionService::RequestLogout()
305void DBusUnitySessionService::RequestLogout()
304{
306{
305 Q_EMIT LogoutRequested(false);
307 Q_EMIT LogoutRequested(false);
308+ Q_EMIT logoutRequested(false);
306}
309}
307
310
308void DBusUnitySessionService::Reboot()
311void DBusUnitySessionService::Reboot()
@@ -313,6 +316,7 @@ void DBusUnitySessionService::Reboot()
313void DBusUnitySessionService::RequestReboot()
316void DBusUnitySessionService::RequestReboot()
314{
317{
315 Q_EMIT RebootRequested(false);
318 Q_EMIT RebootRequested(false);
319+ Q_EMIT rebootRequested(false);
316}
320}
317
321
318void DBusUnitySessionService::Shutdown()
322void DBusUnitySessionService::Shutdown()
@@ -338,6 +342,7 @@ void DBusUnitySessionService::HybridSleep()
338void DBusUnitySessionService::RequestShutdown()
342void DBusUnitySessionService::RequestShutdown()
339{
343{
340 Q_EMIT ShutdownRequested(false);
344 Q_EMIT ShutdownRequested(false);
345+ Q_EMIT shutdownRequested(false);
341}
346}
342
347
343enum class Action : unsigned
348enum class Action : unsigned
plugins/Unity/Session/dbusunitysessionservice.h+5
@@ -56,6 +56,7 @@ Q_SIGNALS:
56 * which inhibit the logout.
56 * which inhibit the logout.
57 */
57 */
58 Q_SCRIPTABLE void LogoutRequested(bool have_inhibitors);
58 Q_SCRIPTABLE void LogoutRequested(bool have_inhibitors);
59+ void logoutRequested(bool have_inhibitors);
59
60
60 /**
61 /**
61 * RebootRequested signal
62 * RebootRequested signal
@@ -66,6 +67,7 @@ Q_SIGNALS:
66 * which inhibit the reboot.
67 * which inhibit the reboot.
67 */
68 */
68 Q_SCRIPTABLE void RebootRequested(bool have_inhibitors);
69 Q_SCRIPTABLE void RebootRequested(bool have_inhibitors);
70+ void rebootRequested(bool have_inhibitors);
69
71
70 /**
72 /**
71 * ShutdownRequested signal
73 * ShutdownRequested signal
@@ -76,6 +78,7 @@ Q_SIGNALS:
76 * which inhibit the shutdown.
78 * which inhibit the shutdown.
77 */
79 */
78 Q_SCRIPTABLE void ShutdownRequested(bool have_inhibitors);
80 Q_SCRIPTABLE void ShutdownRequested(bool have_inhibitors);
81+ void shutdownRequested(bool have_inhibitors);
79
82
80 /**
83 /**
81 * LogoutReady signal
84 * LogoutReady signal
@@ -84,11 +87,13 @@ Q_SIGNALS:
84 * is safe to logout.
87 * is safe to logout.
85 */
88 */
86 Q_SCRIPTABLE void LogoutReady();
89 Q_SCRIPTABLE void LogoutReady();
90+ void logoutReady();
87
91
88 /**
92 /**
89 * Emitted as a result of calling PromptLock()
93 * Emitted as a result of calling PromptLock()
90 */
94 */
91 Q_SCRIPTABLE void LockRequested();
95 Q_SCRIPTABLE void LockRequested();
96+ void lockRequested();
92
97
93 /**
98 /**
94 * Emitted after the session has been locked.
99 * Emitted after the session has been locked.