Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Catch errors when trying to read from settings portal

Browse Source 
`g_dbus_proxy_call_sync` will return NULL and set the recoverable
`error` in case of failure.

We didn't catch this previously so reading the variant from the return
value caused a CRITICAL because a user didn't have the `week-start-day`
setting (introduced in 50.alpha) and the returned `GVariant` was NULL.

Now, we check whether en error is set after calling
`g_dbus_proxy_call_sync` and propagate it to the calling method so it
can gracefully handle it.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/862>
This commit is contained in:
mindonwarp
2026-10-03 13:26:49 +02:00
parent 0a72c05311
commit 81fa0f29c4
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/gcal-context.c
+29 -20
View File
@@ -127,7 +127,7 @@ set_week_start_day_from_variant (GcalContext *self,
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WEEK_START_DAY]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WEEK_START_DAY]);
} }
static void static gboolean
read_variant_from_settings_portal (GcalContext *self, read_variant_from_settings_portal (GcalContext *self,
const char *namespace, const char *namespace,
const char *key, const char *key,
@@ -135,9 +135,10 @@ read_variant_from_settings_portal (GcalContext *self,
GError **error) GError **error)
{ {
g_autoptr (GVariant) ret = NULL; g_autoptr (GVariant) ret = NULL;
g_autoptr (GError) internal_error = NULL;
g_assert_nonnull (value); g_assert (value);
g_assert_nonnull (error); g_assert (error);
ret = g_dbus_proxy_call_sync (self->settings_portal, ret = g_dbus_proxy_call_sync (self->settings_portal,
"ReadOne", "ReadOne",
@@ -145,9 +146,17 @@ read_variant_from_settings_portal (GcalContext *self,
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
G_MAXINT, G_MAXINT,
NULL, NULL,
error); &internal_error);
if (internal_error) /* `ret` is also NULL in this case */
{
g_propagate_error (error, internal_error);
return FALSE;
}
g_variant_get (ret, "(v)", value); g_variant_get (ret, "(v)", value);
return TRUE;
} }
static gboolean static gboolean
@@ -156,15 +165,15 @@ read_time_format (GcalContext *self)
g_autoptr (GVariant) value = NULL; g_autoptr (GVariant) value = NULL;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
read_variant_from_settings_portal (self, if (!read_variant_from_settings_portal (self,
DESKTOP_SETTINGS_INTERFACE_NAMESPACE, DESKTOP_SETTINGS_INTERFACE_NAMESPACE,
CLOCK_FORMAT_KEY, CLOCK_FORMAT_KEY,
&value, &value,
&error); &error))
if (error)
{ {
g_warning ("Failed to read the clock-format setting through the settings portal: %s", error->message); if (error)
g_warning ("Failed to read the clock-format setting through the settings portal: %s", error->message);
return FALSE; return FALSE;
} }
@@ -179,15 +188,15 @@ read_week_start_day (GcalContext *self)
g_autoptr (GVariant) value = NULL; g_autoptr (GVariant) value = NULL;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
read_variant_from_settings_portal (self, if (!read_variant_from_settings_portal (self,
DESKTOP_SETTINGS_CALENDAR_NAMESPACE, DESKTOP_SETTINGS_CALENDAR_NAMESPACE,
CALENDAR_WEEK_START_DAY_KEY, CALENDAR_WEEK_START_DAY_KEY,
&value, &value,
&error); &error))
if (error)
{ {
g_warning ("Failed to read the week-start-day setting through the settings portal: %s", error->message); if (error)
g_warning ("Failed to read the week-start-day setting through the settings portal: %s", error->message);
return FALSE; return FALSE;
} }