csm-manager.c: Add functionality to restart the cinnamon-launcher on-demand #184
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
There was a problem hiding this comment.
Pull Request Overview
This PR adds functionality to restart the cinnamon-launcher on-demand in order to ensure cinnamon-session runs in the correct login session, which helps prevent polkit authentication issues. Key changes include adding new XML properties and methods for session and restart operations, introducing a new API to retrieve the login session ID in various system backends, and wiring a new DBus method to trigger the restart.
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| cinnamon-session/org.gnome.SessionManager.xml | Added SessionId property and RestartCinnamonLauncher method |
| cinnamon-session/csm-systemd.c | Implemented csm_systemd_get_login_session_id |
| cinnamon-session/csm-system.h | Extended system interface for login session ID retrieval |
| cinnamon-session/csm-system.c | Exposed login session ID via the system interface |
| cinnamon-session/csm-session-fill.c | Exported login session ID post session activation |
| cinnamon-session/csm-manager.h | Declared export function for login session ID |
| cinnamon-session/csm-manager.c | Added restart_cinnamon_launcher logic and DBus handler implementation |
| cinnamon-session/csm-consolekit.c | Provided stub implementation for consolekit login session ID |
| cinnamon-session/csm-app.c | Modified app restart behavior to only trigger via DBus if cinnamon.desktop |
cinnamon-session/csm-systemd.c
Outdated
| ret = sd_pid_get_session (getpid (), &pid_session); | ||
|
|
||
| if (ret < 0) { | ||
| g_printerr ("can't get logion session id for cinnamon-session. errno: %d\n", -ret); |
There was a problem hiding this comment.
Typo in error message: 'logion' should be corrected to 'login'.
Suggested change
| g_printerr ("can't get logion session id for cinnamon-session. errno: %d\n", -ret); | |
| g_printerr ("can't get login session id for cinnamon-session. errno: %d\n", -ret); |
on-demand. This allows cinnamon to be restarted under the correct login session to prevent blocking of polkit authentication.
mtwebster
force-pushed
the
restart-cinnamon-launcher
branch
from
d45db1b to
78ec351
Compare
mtwebster
added a commit
to linuxmint/cinnamon
that referenced
this pull request
May 13, 2025
correct login session when registering. Compare Cinnamon's session id with cinnamon-session's (which should never change), and have cinnamon-session restart us if there is a mismatch. Ref: #12669, #12728. See: linuxmint/cinnamon-session#184.
mtwebster
added a commit
to linuxmint/cinnamon
that referenced
this pull request
May 21, 2025
correct login session when registering. Compare Cinnamon's session id with cinnamon-session's (which should never change), and have cinnamon-session restart us if there is a mismatch. Ref: #12669, #12728. See: linuxmint/cinnamon-session#184.
mtwebster
added a commit
to linuxmint/cinnamon
that referenced
this pull request
May 21, 2025
correct login session when registering. Compare Cinnamon's session id with cinnamon-session's (which should never change), and have cinnamon-session restart us if there is a mismatch. Ref: #12669, #12728. See: linuxmint/cinnamon-session#184.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This allows cinnamon to be restarted under the correct login session to prevent blocking of polkit authentication.