Merge pull request #329823 from ExpidusOS/fix/pkgsllvm/elfutils
[NixPkgs.git] / pkgs / by-name / ev / evolution-data-server / drop-tentative-settings-constructor.patch
bloba86d1966eb6bcc5699a2713a4ff7809179063070
1 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
2 index f1614f2..c01e8b2 100644
3 --- a/src/calendar/libecal/e-reminder-watcher.c
4 +++ b/src/calendar/libecal/e-reminder-watcher.c
5 @@ -2609,26 +2609,6 @@ e_reminder_watcher_load_clock_format (EReminderWatcher *watcher)
6 g_free (clock_format);
9 -static GSettings*
10 -e_reminder_watcher_load_settings_tentative (const gchar *schema_id)
12 - GSettings *settings;
13 - GSettingsSchemaSource *schema_source;
14 - GSettingsSchema *schema;
16 - schema_source = g_settings_schema_source_get_default ();
17 - schema = g_settings_schema_source_lookup (schema_source, schema_id, TRUE);
19 - if (schema == NULL) {
20 - return NULL;
21 - }
23 - settings = g_settings_new (schema_id);
24 - /* only unref after g_settings_new() to avoid needless realloc */
25 - g_settings_schema_unref (schema);
26 - return settings;
29 static void
30 e_reminder_watcher_init (EReminderWatcher *watcher)
32 @@ -2647,7 +2627,7 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
33 watcher->priv = e_reminder_watcher_get_instance_private (watcher);
34 watcher->priv->cancellable = g_cancellable_new ();
35 watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar");
36 - watcher->priv->desktop_settings = e_reminder_watcher_load_settings_tentative ("org.gnome.desktop.interface");
37 + watcher->priv->desktop_settings = g_settings_new ("org.gnome.desktop.interface");
38 if (watcher->priv->desktop_settings) {
39 g_signal_connect_object (
40 watcher->priv->desktop_settings,