s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsettings: Don't crash when unavailable

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-03-03 19:10:40 +00:00
parent c28f07fcfd
commit b3cfc8a0f3
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
eekboard/eekboard-context-service.c
View File

@ -113,6 +113,9 @@ eekboard_context_service_dispose (GObject *object)
static void static void
settings_get_layout(GSettings *settings, char **type, char **layout) settings_get_layout(GSettings *settings, char **type, char **layout)
{ {
if (!settings) {
return;
}
GVariant *inputs = g_settings_get_value(settings, "sources"); GVariant *inputs = g_settings_get_value(settings, "sources");
if (g_variant_n_children(inputs) == 0) { if (g_variant_n_children(inputs) == 0) {
g_warning("No system layout present"); g_warning("No system layout present");
@ -257,14 +260,29 @@ eekboard_context_service_init (EekboardContextService *self)
g_direct_equal, g_direct_equal,
NULL, NULL,
(GDestroyNotify)g_object_unref); (GDestroyNotify)g_object_unref);
const char *schema_name = "org.gnome.desktop.input-sources";
self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources"); GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
gulong conn_id = g_signal_connect(self->priv->settings, "change-event", if (ssrc) {
G_CALLBACK(settings_handle_layout_changed), GSettingsSchema *schema = g_settings_schema_source_lookup(ssrc,
self); schema_name,
if (conn_id == 0) { TRUE);
g_warning ("Could not connect to gsettings updates, layout" if (schema) {
" changing unavailable"); // Not referencing the found schema directly,
// because it's not clear how...
self->priv->settings = g_settings_new (schema_name);
gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
G_CALLBACK(settings_handle_layout_changed),
self);
if (conn_id == 0) {
g_warning ("Could not connect to gsettings updates, "
"automatic layout changing unavailable");
}
} else {
g_warning("Gsettings schema %s is not installed on the system. "
"Layout switching unavailable", schema_name);
}
} else {
g_warning("No gsettings schemas installed. Layout switching unavailable.");
} }
self->priv->overlay = NULL; self->priv->overlay = NULL;