Skip to content

src/backend-dbus/actions.c: Fix MATE lockdown support (don't require … #105

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
sunweaver wants to merge 1 commit into
base: main
Choose a base branch
from
Open

src/backend-dbus/actions.c: Fix MATE lockdown support (don't require … #105

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
29 changes: 20 additions & 9 deletions src/backend-dbus/actions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,21 +1114,32 @@ static void
indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self)
{
priv_t * p;
GSettings * s;
GSettings * s = null;
Copy link

@gber gber Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/null/NULL/


p = indicator_session_actions_dbus_get_instance_private (self);
p->cancellable = g_cancellable_new ();
p->seat_allows_activation = TRUE;
self->priv = p;

s = g_settings_new ("org.gnome.desktop.lockdown");
g_signal_connect_swapped (s, "changed::disable-lock-screen",
G_CALLBACK(indicator_session_actions_notify_can_lock), self);
g_signal_connect_swapped (s, "changed::disable-log-out",
G_CALLBACK(indicator_session_actions_notify_can_logout), self);
g_signal_connect_swapped (s, "changed::disable-user-switching",
G_CALLBACK(indicator_session_actions_notify_can_switch), self);
p->lockdown_settings = s;
if (ayatana_common_utils_is_gnome() || ayatana_common_utils_is_budgie())
{
s = g_settings_new ("org.gnome.desktop.lockdown");
}
elif (ayatana_common_utils_is_mate())
Copy link

@gber gber Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/elif/else if/

{
s = g_settings_new ("org.mate.desktop.lockdown");
}

if (s)
{
g_signal_connect_swapped (s, "changed::disable-lock-screen",
G_CALLBACK(indicator_session_actions_notify_can_lock), self);
g_signal_connect_swapped (s, "changed::disable-log-out",
G_CALLBACK(indicator_session_actions_notify_can_logout), self);
g_signal_connect_swapped (s, "changed::disable-user-switching",
G_CALLBACK(indicator_session_actions_notify_can_switch), self);
p->lockdown_settings = s;
}
Copy link

@gber gber Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have the possibility that p->lockdown_settings might no longer be set here, does indicator_session_actions_dbus_get_instance_private() ensure that it is initialized to NULL and does the code handling it expect it to be null?

Copy link

@gber gber Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're not sure about this it might be a better idea to check for Mate and else assume GNOME.


s = g_settings_new ("org.ayatana.indicator.session");
g_signal_connect_swapped (s, "changed::suppress-logout-restart-shutdown",
Expand Down