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

refactor: Reduce code duplication in GcalContext

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/822>
This commit is contained in:
mindonwarp
2026-09-26 17:21:58 +00:00
committed by Marge Bot
parent 6e1330430b
commit c874bde622
1 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/gcal-context.c
+39 -28
View File
@@ -26,7 +26,9 @@
#include <gdesktop-enums.h> #include <gdesktop-enums.h>
#include "gdesktop-enum-types.h" #include "gdesktop-enum-types.h"
#define DESKTOP_SETTINGS_INTERFACE_NAMESPACE "org.gnome.desktop.interface"
#define DESKTOP_SETTINGS_CALENDAR_NAMESPACE "org.gnome.desktop.calendar" #define DESKTOP_SETTINGS_CALENDAR_NAMESPACE "org.gnome.desktop.calendar"
#define CLOCK_FORMAT_KEY "clock-format"
#define CALENDAR_WEEK_START_DAY_KEY "week-start-day" #define CALENDAR_WEEK_START_DAY_KEY "week-start-day"
struct _GcalContext struct _GcalContext
@@ -117,21 +119,40 @@ 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 gboolean static void
read_time_format (GcalContext *self) read_variant_from_settings_portal (GcalContext *self,
const char *namespace,
const char *key,
GVariant **value,
GError **error)
{ {
g_autoptr (GVariant) other_child = NULL;
g_autoptr (GVariant) child = NULL;
g_autoptr (GVariant) ret = NULL; g_autoptr (GVariant) ret = NULL;
g_autoptr (GError) error = NULL;
g_assert_nonnull (value);
g_assert_nonnull (error);
ret = g_dbus_proxy_call_sync (self->settings_portal, ret = g_dbus_proxy_call_sync (self->settings_portal,
"Read", "ReadOne",
g_variant_new ("(ss)", "org.gnome.desktop.interface", "clock-format"), g_variant_new ("(ss)", namespace, key),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
G_MAXINT, G_MAXINT,
NULL, NULL,
&error); error);
g_variant_get (ret, "(v)", value);
}
static gboolean
read_time_format (GcalContext *self)
{
g_autoptr (GVariant) value = NULL;
g_autoptr (GError) error = NULL;
read_variant_from_settings_portal (self,
DESKTOP_SETTINGS_INTERFACE_NAMESPACE,
CLOCK_FORMAT_KEY,
&value,
&error);
if (error) if (error)
{ {
@@ -139,10 +160,7 @@ read_time_format (GcalContext *self)
return FALSE; return FALSE;
} }
g_variant_get (ret, "(v)", &child); set_time_format_from_variant (self, value);
g_variant_get (child, "v", &other_child);
set_time_format_from_variant (self, other_child);
return TRUE; return TRUE;
} }
@@ -150,18 +168,14 @@ read_time_format (GcalContext *self)
static gboolean static gboolean
read_week_start_day (GcalContext *self) read_week_start_day (GcalContext *self)
{ {
g_autoptr (GVariant) other_child = NULL; g_autoptr (GVariant) value = NULL;
g_autoptr (GVariant) child = NULL;
g_autoptr (GVariant) ret = NULL;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
ret = g_dbus_proxy_call_sync (self->settings_portal, read_variant_from_settings_portal (self,
"Read", DESKTOP_SETTINGS_CALENDAR_NAMESPACE,
g_variant_new ("(ss)", DESKTOP_SETTINGS_CALENDAR_NAMESPACE, CALENDAR_WEEK_START_DAY_KEY), CALENDAR_WEEK_START_DAY_KEY,
G_DBUS_CALL_FLAGS_NONE, &value,
G_MAXINT, &error);
NULL,
&error);
if (error) if (error)
{ {
@@ -169,10 +183,7 @@ read_week_start_day (GcalContext *self)
return FALSE; return FALSE;
} }
g_variant_get (ret, "(v)", &child); set_week_start_day_from_variant (self, value);
g_variant_get (child, "v", &other_child);
set_week_start_day_from_variant (self, other_child);
return TRUE; return TRUE;
} }
@@ -197,8 +208,8 @@ on_portal_proxy_signal_cb (GDBusProxy *proxy,
g_variant_get (parameters, "(&s&sv)", &namespace, &name, &value); g_variant_get (parameters, "(&s&sv)", &namespace, &name, &value);
if (g_strcmp0 (namespace, "org.gnome.desktop.interface") == 0 && if (g_strcmp0 (namespace, DESKTOP_SETTINGS_INTERFACE_NAMESPACE) == 0 &&
g_strcmp0 (name, "clock-format") == 0) g_strcmp0 (name, CLOCK_FORMAT_KEY) == 0)
{ {
set_time_format_from_variant (self, value); set_time_format_from_variant (self, value);
} }