aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRatchanan Srirattanamet <ratchanan@ubports.com>2022-06-23 17:03:29 +0700
committerRatchanan Srirattanamet <ratchanan@ubports.com>2022-06-23 17:04:53 +0700
commiteff77527efd7758260dcca5529941baa6d4968e7 (patch)
treed50b8fa5ffbc5a17701a8ca90def326e20eb903c
parent95096378859bb57398be70a9bc51eb923ba732b5 (diff)
downloadayatana-indicator-session-eff77527efd7758260dcca5529941baa6d4968e7.tar.gz
ayatana-indicator-session-eff77527efd7758260dcca5529941baa6d4968e7.tar.bz2
ayatana-indicator-session-eff77527efd7758260dcca5529941baa6d4968e7.zip
src/service.c: don't try to show any lockscreen shortcut on Lomiri
Lomiri itself doesn't read any schema for the lockscreen [1]. It also won't show the "accel" or shortcut property of a GMenuItem [2]. Thus, I think it's not worth it to add a schema in lomiri-schemas just to be ignored by Lomiri both ways. As such, remove the functionality to read a shortcut for lockscreen on Lomiri. While we're at it, also make sure that `p->keybinding_settings` is initialized even if it's on non of the recognized DE. [1] https://gitlab.com/ubports/development/core/lomiri/-/blob/main/qml/Components/Dialogs.qml#L121-124 [2] https://gitlab.com/ubports/development/core/lomiri/-/blob/main/qml/Panel/Indicators/IndicatorMenuItemFactory.qml
-rw-r--r--src/service.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/service.c b/src/service.c
index 4e9fe8c..b7d0a55 100644
--- a/src/service.c
+++ b/src/service.c
@@ -662,11 +662,7 @@ create_switch_section (IndicatorSessionService * self, int profile)
str = g_settings_get_string (p->keybinding_settings, "screensaver");
}
- else if (ayatana_common_utils_is_lomiri())
- {
- str = g_settings_get_string (p->keybinding_settings, "lockscreen");
- }
- else
+ else if (p->keybinding_settings)
{
gchar **lAccels = g_settings_get_strv(p->keybinding_settings, "screensaver");
@@ -1276,6 +1272,7 @@ indicator_session_service_init (IndicatorSessionService * self)
/* init our priv pointer */
p = indicator_session_service_get_instance_private (self);
p->indicator_settings = g_settings_new ("org.ayatana.indicator.session");
+ p->keybinding_settings = NULL;
if (ayatana_common_utils_is_mate())
{
p->keybinding_settings = g_settings_new ("org.mate.SettingsDaemon.plugins.media-keys");
@@ -1294,8 +1291,7 @@ indicator_session_service_init (IndicatorSessionService * self)
}
else if (ayatana_common_utils_is_lomiri())
{
- p->keybinding_settings = g_settings_new ("com.lomiri.Shell.Shortcuts");
-
+ // Lomiri does not have a keybinding schema. However it has a usage mode schema.
usage_mode_schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
usage_mode_schema_name, TRUE);
if (usage_mode_schema)
@@ -1379,8 +1375,11 @@ indicator_session_service_init (IndicatorSessionService * self)
/* watch for changes to the lock keybinding */
gp = p->keybinding_settings;
- g_signal_connect_swapped (gp, "changed::screensaver",
- G_CALLBACK(rebuild_switch_section_soon), self);
+ if (gp)
+ {
+ g_signal_connect_swapped (gp, "changed::screensaver",
+ G_CALLBACK(rebuild_switch_section_soon), self);
+ }
self->priv->own_id = g_bus_own_name (G_BUS_TYPE_SESSION,
BUS_NAME,