Attachment 1980296 Details for Bug 2227002 – eds-fix-clock-format-v2.patch

[patch] eds-fix-clock-format-v2.patch

eds-fix-clock-format-v2.patch (text/plain), 2.57 KB, created by Melker Narikka on 2023-07-27 14:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Melker Narikka

Created: 2023-07-27 14:39:05 UTC

Size: 2.57 KB

patch

obsolete

>diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
>index 5a0849019..06d34f3fb 100644
>--- a/src/calendar/libecal/e-reminder-watcher.c
>+++ b/src/calendar/libecal/e-reminder-watcher.c
>@@ -59,6 +59,8 @@ struct _EReminderWatcherPrivate {
> 	ESourceRegistryWatcher *registry_watcher;
> 	GCancellable *cancellable;
> 	GSettings *settings;
>+	GSettings *desktop_settings;
>+	gboolean use_24h;
> 	gboolean timers_enabled;
> 	gulong past_changed_handler_id;
> 	gulong snoozed_changed_handler_id;
>@@ -1370,7 +1372,7 @@ e_reminder_watcher_format_time_impl (EReminderWatcher *watcher,
> 	g_return_if_fail (buffer_size > 0);
> 
> 	tm = e_cal_util_icaltime_to_tm (itt);
>-	e_time_format_date_and_time (&tm, FALSE, FALSE, FALSE, *inout_buffer, buffer_size);
>+	e_time_format_date_and_time (&tm, watcher->priv->use_24h, FALSE, FALSE, *inout_buffer, buffer_size);
> }
> 
> static GSList * /* EReminderData * */
>@@ -2575,6 +2577,26 @@ e_reminder_watcher_class_init (EReminderWatcherClass *klass)
> 		G_TYPE_NONE);
> }
> 
>+static void
>+e_reminder_watcher_load_clock_format (EReminderWatcher *watcher)
>+{
>+	if (watcher->priv->desktop_settings) {
>+		gchar *clock_format = g_settings_get_string(watcher->priv->desktop_settings, "clock-format");
>+		watcher->priv->use_24h = g_strcmp0(clock_format, "24h") == 0;
>+		g_free(clock_format);
>+	}
>+}
>+
>+static GSettings*
>+e_reminder_watcher_load_settings_tentative(const gchar *schema_id)
>+{
>+	GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default ();
>+	if (!g_settings_schema_source_lookup (schema_source, schema_id, FALSE)) {
>+		return NULL;
>+	}
>+	return g_settings_new (schema_id);
>+}
>+
> static void
> e_reminder_watcher_init (EReminderWatcher *watcher)
> {
>@@ -2593,6 +2615,15 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
> 	watcher->priv = e_reminder_watcher_get_instance_private (watcher);
> 	watcher->priv->cancellable = g_cancellable_new ();
> 	watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar");
>+	watcher->priv->desktop_settings = e_reminder_watcher_load_settings_tentative ("org.gnome.desktop.interface");
>+	if (watcher->priv->desktop_settings) {
>+		g_signal_connect_object (watcher->priv->desktop_settings,
>+			"changed::clock-format",
>+			G_CALLBACK (e_reminder_watcher_load_clock_format),
>+			watcher,
>+			G_CONNECT_SWAPPED);
>+	}
>+	e_reminder_watcher_load_clock_format(watcher);
> 	watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist);
> 	watcher->priv->default_zone = e_cal_util_copy_timezone (zone);
> 	watcher->priv->timers_enabled = TRUE;

Actions: View | Diff

Attachments on bug 2227002: 1980250 | 1980296