Skip to content

Fixes "cinnamon-session-quit --logout --no-prompt --force" not working #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2025
Merged

Fixes "cinnamon-session-quit --logout --no-prompt --force" not working #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions cinnamon-session-quit/cinnamon-session-quit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def __init__(self):
group.add_argument("--reboot", dest="mode", action='store_const', const=Action.RESTART,
help="Log out")
parser.add_argument("--force", dest="force", action="store_true",
help=_("Ignoring any existing inhibitors"))
help=_("Ignoring any existing inhibitors. Implies --no-prompt"))
parser.add_argument("--no-prompt", dest="no_prompt", action='store_true',
help=_("Don't prompt for user confirmation"))
parser.add_argument("--sm-owned", action="store_true", help=argparse.SUPPRESS)
Expand All @@ -76,8 +76,13 @@ def __init__(self):
self.mode = args.mode
self.default_response = ResponseCode(int(self.mode))

self.force = args.force
self.no_prompt = args.no_prompt
if args.force:
self.LogoutMode = LogoutParams.FORCE
elif args.no_prompt:
self.LogoutMode = LogoutParams.NO_PROMPT
else:
self.LogoutMode = LogoutParams.NORMAL

self.sm_owned = args.sm_owned
self.bus_id = args.bus_id

Expand Down Expand Up @@ -120,16 +125,10 @@ def async_cb(proxy, res):
print("An error occurred forwarding to the session manager: %s" % e.message, file=sys.stderr, end=None)

if self.mode == Action.LOGOUT:
arg = LogoutParams.NORMAL

if self.no_prompt:
arg |= LogoutParams.NO_PROMPT
if self.force:
arg |= LogoutParams.FORCE

sm_proxy.call(
"Logout",
GLib.Variant("(u)", [arg]),
GLib.Variant("(u)", [self.LogoutMode]),
Gio.DBusCallFlags.NO_AUTO_START,
-1,
None,
Expand Down
Loading