D21995: Split ksmserver into a small application that handles startup and ksmserver
This revision was automatically updated to reflect the committed changes. Closed by commit R120:6bab1f518c50: Split ksmserver into a small application that handles startup and ksmserver (authored by bruns, committed by davidedmundson). CHANGED PRIOR TO COMMIT https://phabricator.kde.org/D21995?vs=61150=61554#toc REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=61150=61554 REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h libkworkspace/CMakeLists.txt startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/README startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Shutdown.xml startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma, apol Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
apol accepted this revision. apol added a comment. This revision is now accepted and ready to land. Let's do this! REPOSITORY R120 Plasma Workspace BRANCH master REVISION DETAIL https://phabricator.kde.org/D21995 To: davidedmundson, #plasma, apol Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 61150. davidedmundson added a comment. Reset state when told to resume an empty session REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=61149=61150 BRANCH master REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h libkworkspace/CMakeLists.txt startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Shutdown.xml startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 61149. davidedmundson added a comment. update2 REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=61147=61149 BRANCH master REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h libkworkspace/CMakeLists.txt startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Shutdown.xml startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 61147. davidedmundson added a comment. update REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=61015=61147 REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h libkworkspace/CMakeLists.txt startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Shutdown.xml startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 61015. davidedmundson marked an inline comment as done. davidedmundson added a comment. whitespace REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=61014=61015 BRANCH master REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h libkworkspace/CMakeLists.txt startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Shutdown.xml startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 61014. davidedmundson added a comment. update REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=60421=61014 BRANCH master REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h libkworkspace/CMakeLists.txt startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Shutdown.xml startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson added inline comments. INLINE COMMENTS > apol wrote in startup.cpp:417 > watcher->deleteLater(); It's a QDbusServiceWatcher not a QDBusPendingCallWatcher it's parented to the job which will quit REPOSITORY R120 Plasma Workspace REVISION DETAIL https://phabricator.kde.org/D21995 To: davidedmundson, #plasma Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
apol added inline comments.
INLINE COMMENTS
> server.h:56
>
> +
> #define SESSION_PREVIOUS_LOGOUT "saved at previous logout"
?
> startup.cpp:417
> +connect(watcher, ::serviceRegistered, this, [=]() {
> +emitResult();
> +});
watcher->deleteLater();
REPOSITORY
R120 Plasma Workspace
REVISION DETAIL
https://phabricator.kde.org/D21995
To: davidedmundson, #plasma
Cc: apol, bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2,
ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg,
abetts, sebas, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 60421. davidedmundson added a comment. update REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=60345=60421 BRANCH davidedmundson/ksession REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson added inline comments.
INLINE COMMENTS
> shutdown.cpp:66
> runShutdownScripts();
> -KDisplayManager().shutdown( m_shutdownType,
> KWorkSpace::ShutdownModeDefault);
> +// if (m_shutdownType == KWorkSpace::ShutdownTypeHalt) {
> +// SessionBackend::self()->shutdown();
This code is ready, just commented out due to waiting on libkworkspace2
Commented out to allow for testing without making them dependent.
REPOSITORY
R120 Plasma Workspace
REVISION DETAIL
https://phabricator.kde.org/D21995
To: davidedmundson, #plasma
Cc: bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen,
Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts,
sebas, apol, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson updated this revision to Diff 60345. davidedmundson marked an inline comment as done. davidedmundson added a comment. Update merge issue REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D21995?vs=60340=60345 BRANCH davidedmundson/ksession REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp To: davidedmundson, #plasma Cc: bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
bshah added inline comments. INLINE COMMENTS > CMakeLists.txt:8 > ecm_qt_declare_logging_category(plasma_waitforname_SRCS HEADER debug_p.h > IDENTIFIER LOG_PLASMA CATEGORY_NAME org.kde.knotifications) > -ecm_mark_nongui_executable(ksyncdbusenv) > ? REPOSITORY R120 Plasma Workspace REVISION DETAIL https://phabricator.kde.org/D21995 To: davidedmundson, #plasma Cc: bshah, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D21995: Split ksmserver into a small application that handles startup and ksmserver
davidedmundson created this revision. davidedmundson added a reviewer: Plasma. Herald added a project: Plasma. Herald added a subscriber: plasma-devel. davidedmundson requested review of this revision. REVISION SUMMARY This allows new startup procedures to use a session manager and also allows us to slowly replace the session manager without breaking plasma. Following on from the previous refactor, Startup and Shutdown are moved from kmserver and the previous calls into KSMserver are replaced with DBus calls. TEST PLAN Logged in REPOSITORY R120 Plasma Workspace BRANCH davidedmundson/ksession REVISION DETAIL https://phabricator.kde.org/D21995 AFFECTED FILES ksmserver/CMakeLists.txt ksmserver/autostart.cpp ksmserver/autostart.h ksmserver/logout.cpp ksmserver/main.cpp ksmserver/org.kde.KSMServerInterface.xml ksmserver/org.kde.Shutdown.xml ksmserver/server.cpp ksmserver/server.h ksmserver/shutdown.cpp ksmserver/shutdown.h ksmserver/startup.cpp ksmserver/startup.h startkde/CMakeLists.txt startkde/plasma-session/CMakeLists.txt startkde/plasma-session/autostart.cpp startkde/plasma-session/autostart.h startkde/plasma-session/main.cpp startkde/plasma-session/org.kde.Startup.xml startkde/plasma-session/shutdown.cpp startkde/plasma-session/shutdown.h startkde/plasma-session/startup.cpp startkde/plasma-session/startup.h startkde/startplasma.cpp startkde/waitforname/CMakeLists.txt To: davidedmundson, #plasma Cc: plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
