sync: from linuxdeepin/dde-session-shell #447
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#29
Reviewer's GuideThis PR syncs updates from linuxdeepin/dde-session-shell, integrating a display manager–based session filtering workaround, refining user login state logic, and correcting CMake install directives for the greeter executable. Sequence diagram for updated user login state filtering via DisplayManagersequenceDiagram
participant SessionBaseModel
participant DBusDisplayManager
participant DBusDisplayManagerSession
actor Systemd
SessionBaseModel->>DBusDisplayManager: Query sessions()
loop For each session
DBusDisplayManager->>DBusDisplayManagerSession: Get session path
DBusDisplayManagerSession->>DBusDisplayManagerSession: Get UserName property
alt UserName is not empty
SessionBaseModel->>SessionBaseModel: Add to loggedUserNameList
end
end
SessionBaseModel->>SessionBaseModel: Use loggedUserNameList to filter logined users
Note right of SessionBaseModel: Only users present in DisplayManager sessions are considered logged in
Systemd-->>SessionBaseModel: (Sessions may be stale if kwin crashes)
Class diagram for updated SessionBaseModel user login logicclassDiagram
class SessionBaseModel {
- m_loginedUsers: QMap
- m_users: QMap
+ updateLoginedUserList(list: QString)
+ addUser(path: QString)
}
class DBusDisplayManager {
+ sessions(): QList<Session>
}
class DBusDisplayManagerSession {
+ path(): QString
+ property(name: QString): QVariant
}
SessionBaseModel --> DBusDisplayManager : uses
DBusDisplayManager --> DBusDisplayManagerSession : manages
SessionBaseModel --> DBusDisplayManagerSession : queries
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Contributor
Author
deepin pr auto review代码审查意见：
总体来说，代码的修改看起来是合理的，但是需要注意确保所有新增的 |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey @deepin-ci-robot - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `src/session-widgets/sessionbasemodel.cpp:480` </location>
<code_context>
+ loggedUserNameList.append(userName);
+ }
+ }
+ qInfo(DDE_SHELL) << "Logined users from display manager: " << loggedUserNameList;
QList<QString> loginedUsersTmp = m_loginedUsers->keys();
</code_context>
<issue_to_address>
Consider using 'Logged-in' instead of 'Logined' in log messages.
Using standard terminology like 'Logged-in' enhances clarity and maintainability.
Suggested implementation:
```cpp
qInfo(DDE_SHELL) << "Logged-in users from display manager: " << loggedUserNameList;
QList<QString> loggedInUsersTmp = m_loginedUsers->keys();
```
If `loginedUsersTmp` is used elsewhere in this function or file, you should also rename those occurrences to `loggedInUsersTmp` for consistency.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
| loggedUserNameList.append(userName); | ||
| } | ||
| } | ||
| qInfo(DDE_SHELL) << "Logined users from display manager: " << loggedUserNameList; |
There was a problem hiding this comment.
nitpick (typo): Consider using 'Logged-in' instead of 'Logined' in log messages.
Using standard terminology like 'Logged-in' enhances clarity and maintainability.
Suggested implementation:
qInfo(DDE_SHELL) << "Logged-in users from display manager: " << loggedUserNameList;
QList<QString> loggedInUsersTmp = m_loginedUsers->keys();
If loginedUsersTmp is used elsewhere in this function or file, you should also rename those occurrences to loggedInUsersTmp for consistency.
yixinshark
approved these changes
Aug 14, 2025
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: deepin-ci-robot, yixinshark The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Synchronize source files from linuxdeepin/dde-session-shell.
Source-pull-request: linuxdeepin/dde-session-shell#29
Summary by Sourcery
Sync session-shell changes to filter stale sessions, prevent login state crashes for custom accounts, and correct greeter installation in CMake.
Bug Fixes:
Enhancements:
Build: