-
Couldn't load subscription status.
- Fork 7
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.
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
base: main
Are you sure you want to change the base?
Conversation
…org.gnome.desktop.lockdown gsettings to be set, honour org.mate.desktop.lockdown gsettings instead).
de1afa6 to
69772c4
Compare
|
@gber Can you review this? |
|
@gber Please only merge GPG-signed. I normally do this via "View command line instructions" and add a "-S" to the git merge command. |
| { | ||
| priv_t * p; | ||
| GSettings * s; | ||
| GSettings * s = null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/null/NULL/
| { | ||
| s = g_settings_new ("org.gnome.desktop.lockdown"); | ||
| } | ||
| elif (ayatana_common_utils_is_mate()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/elif/else if/
| g_signal_connect_swapped (s, "changed::disable-user-switching", | ||
| G_CALLBACK(indicator_session_actions_notify_can_switch), self); | ||
| p->lockdown_settings = s; | ||
| } |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
…org.gnome.desktop.lockdown gsettings to be set, honour org.mate.desktop.lockdown gsettings instead).