lol
at master 122 lines 4.8 kB view raw
1diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c 2index 32817df..c8b3f2e 100644 3--- a/src/EWS/camel/camel-ews-utils.c 4+++ b/src/EWS/camel/camel-ews-utils.c 5@@ -1550,7 +1550,7 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C 6 gboolean changed = FALSE; 7 8 /* cannot save, when evolution is not installed */ 9- if (!e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.mail")) 10+ if (!TRUE) 11 return FALSE; 12 13 if (!old_categories || !new_categories) 14@@ -1558,7 +1558,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C 15 16 evo_labels = g_ptr_array_new_full (5, g_free); 17 18- settings = g_settings_new ("org.gnome.evolution.mail"); 19+ { 20+ g_autoptr(GSettingsSchemaSource) schema_source; 21+ g_autoptr(GSettingsSchema) schema; 22+ schema_source = g_settings_schema_source_new_from_directory("@evo@", 23+ g_settings_schema_source_get_default(), 24+ TRUE, 25+ NULL); 26+ schema = g_settings_schema_source_lookup(schema_source, 27+ "org.gnome.evolution.mail", 28+ FALSE); 29+ settings = g_settings_new_full(schema, NULL, NULL); 30+ } 31 strv = g_settings_get_strv (settings, "labels"); 32 33 for (ii = 0; strv && strv[ii]; ii++) { 34diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c 35index 7374c36..dbf9099 100644 36--- a/src/Microsoft365/camel/camel-m365-store.c 37+++ b/src/Microsoft365/camel/camel-m365-store.c 38@@ -305,7 +305,7 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca 39 gboolean changed = FALSE; 40 41 /* cannot save, when evolution is not installed */ 42- if (!e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.mail")) 43+ if (!TRUE) 44 return FALSE; 45 46 if (!old_categories || !new_categories) 47@@ -313,7 +313,18 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca 48 49 evo_labels = g_ptr_array_new_full (5, g_free); 50 51- settings = g_settings_new ("org.gnome.evolution.mail"); 52+ { 53+ g_autoptr(GSettingsSchemaSource) schema_source; 54+ g_autoptr(GSettingsSchema) schema; 55+ schema_source = g_settings_schema_source_new_from_directory("@evo@", 56+ g_settings_schema_source_get_default(), 57+ TRUE, 58+ NULL); 59+ schema = g_settings_schema_source_lookup(schema_source, 60+ "org.gnome.evolution.mail", 61+ FALSE); 62+ settings = g_settings_new_full(schema, NULL, NULL); 63+ } 64 strv = g_settings_get_strv (settings, "labels"); 65 66 for (ii = 0; strv && strv[ii]; ii++) { 67diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c 68index cec5417..38f1a87 100644 69--- a/src/Microsoft365/common/e-m365-tz-utils.c 70+++ b/src/Microsoft365/common/e-m365-tz-utils.c 71@@ -192,10 +192,21 @@ e_m365_tz_utils_get_user_timezone (void) 72 gchar *location = NULL; 73 ICalTimezone *zone = NULL; 74 75- if (e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.calendar")) { 76+ if (TRUE) { 77 GSettings *settings; 78 79- settings = g_settings_new ("org.gnome.evolution.calendar"); 80+ { 81+ g_autoptr(GSettingsSchemaSource) schema_source; 82+ g_autoptr(GSettingsSchema) schema; 83+ schema_source = g_settings_schema_source_new_from_directory("@evo@", 84+ g_settings_schema_source_get_default(), 85+ TRUE, 86+ NULL); 87+ schema = g_settings_schema_source_lookup(schema_source, 88+ "org.gnome.evolution.calendar", 89+ FALSE); 90+ settings = g_settings_new_full(schema, NULL, NULL); 91+ } 92 93 if (g_settings_get_boolean (settings, "use-system-timezone")) 94 location = e_cal_util_get_system_timezone_location (); 95diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c 96index f388e3b..ed57213 100644 97--- a/src/common/e-ews-common-utils.c 98+++ b/src/common/e-ews-common-utils.c 99@@ -208,10 +208,21 @@ e_ews_common_utils_get_configured_icaltimezone (void) 100 ICalTimezone *zone = NULL; 101 gchar *location = NULL; 102 103- if (e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.calendar")) { 104+ if (TRUE) { 105 GSettings *settings; 106 107- settings = g_settings_new ("org.gnome.evolution.calendar"); 108+ { 109+ g_autoptr(GSettingsSchemaSource) schema_source; 110+ g_autoptr(GSettingsSchema) schema; 111+ schema_source = g_settings_schema_source_new_from_directory("@evo@", 112+ g_settings_schema_source_get_default(), 113+ TRUE, 114+ NULL); 115+ schema = g_settings_schema_source_lookup(schema_source, 116+ "org.gnome.evolution.calendar", 117+ FALSE); 118+ settings = g_settings_new_full(schema, NULL, NULL); 119+ } 120 121 if (g_settings_get_boolean (settings, "use-system-timezone")) 122 location = e_cal_util_get_system_timezone_location ();