Skip to content

csm-systemd.c: Take the session's logind inhibitor in block-weak mode when available #219

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

Open
Fantu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

csm-systemd.c: Take the session's logind inhibitor in block-weak mode when available #219

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
12 changes: 10 additions & 2 deletions cinnamon-session/csm-systemd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,19 +684,27 @@ csm_systemd_add_inhibitor (CsmSystem *system,
CsmInhibitorFlag flag)
{
CsmSystemd *manager = CSM_SYSTEMD (system);
GVariant *block_weak;
const gchar *mode;

if ((flag & CSM_INHIBITOR_FLAG_SUSPEND) == 0)
return;

if (manager->priv->inhibitors == NULL) {
g_debug ("Adding system inhibitor");
/* Since 257, logind obeys "block" even for the user holding it;
* older versions don't know "block-weak" nor this property. */
block_weak = g_dbus_proxy_get_cached_property (manager->priv->sd_proxy, "BlockWeakInhibited");
mode = block_weak != NULL ? "block-weak" : "block";
g_clear_pointer (&block_weak, g_variant_unref);

g_debug ("Adding system inhibitor (%s)", mode);
g_dbus_proxy_call_with_unix_fd_list (manager->priv->sd_proxy,
"Inhibit",
g_variant_new ("(ssss)",
"sleep:shutdown",
g_get_user_name (),
"user session inhibited",
"block"),
mode),
0,
G_MAXINT,
NULL,
Expand Down
Loading