42060b92 · 579e5a85 · fcb4ab5b · 1b49c951 · 190f7b78 · e33750b9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
 cmake_policy(VERSION 3.1)

 project(evolution-data-server
-	VERSION 3.40.4
+	VERSION 3.42.0
 	LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 14)
 set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
@@ -12,7 +12,7 @@ set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issu
 # Base Version: This is for API/version tracking for things like
 # D-Bus server files. This should always be the major/minor of
 # the stable version or stable version to be.
-set(BASE_VERSION 3.40)
+set(BASE_VERSION 3.42)

 # This number is meaningless, but we're now stuck with it in our
 # library names for backward compatibility.
@@ -48,7 +48,7 @@ set(USER_PROMPTER_DBUS_SERVICE_NAME	"org.gnome.evolution.dataserver.UserPrompter
 # ******************************
 # Library versioning
 # ******************************
-set(LIBCAMEL_CURRENT 62)
+set(LIBCAMEL_CURRENT 63)
 set(LIBCAMEL_REVISION 0)
 set(LIBCAMEL_AGE 0)

@@ -909,6 +909,19 @@ else(ENABLE_LARGEFILE)
 	set(HAVE_O_LARGEFILE OFF)
 endif(ENABLE_LARGEFILE)

+# ******************************
+# Miscellaneous checks
+# ******************************
+
+set(CMAKE_REQUIRED_FLAGS ${GNOME_PLATFORM_CFLAGS})
+set(CMAKE_REQUIRED_INCLUDES ${GNOME_PLATFORM_INCLUDE_DIRS})
+set(CMAKE_REQUIRED_LIBRARIES ${GNOME_PLATFORM_LDFLAGS})
+CHECK_C_SOURCE_COMPILES("#include <gio/gio.h>
+			int main(void) { GPowerProfileMonitor *monitor = g_power_profile_monitor_dup_default (); g_clear_object (&monitor); return 0; }" HAVE_GPOWERPROFILEMONITOR)
+unset(CMAKE_REQUIRED_FLAGS)
+unset(CMAKE_REQUIRED_INCLUDES)
+unset(CMAKE_REQUIRED_LIBRARIES)
+
 # ******************************
 # subparts flags
 # ******************************

--- a/ChangeLog
+++ b/ChangeLog
@@ -4,4 +4,4 @@
 	Get a clone of git repository and list changes with 'git log' there,
 	   $ git clone https://gitlab.gnome.org/GNOME/evolution-data-server.git
 	or browse changes online at
-	   https://gitlab.gnome.org/GNOME/evolution-data-server/commits/gnome-40
+	   https://gitlab.gnome.org/GNOME/evolution-data-server/commits/gnome-41
--- a/NEWS
+++ b/NEWS
-Evolution-Data-Server 3.40.4 2021-08-13
+Evolution-Data-Server 3.42.0 2021-09-17
 ---------------------------------------

-Bug Fixes:
-	I#346 - Camel: "Pipe to program" filter does not work (Milan Crha)
-	M!74 - LDAP: Don't force LDAPS port to 636 (Christoph Ruegge)
-
-Miscellaneous:
-	CamelMimeFilterToHTML: Speed up read of long lines (Milan Crha)
-	CamelMimeFilterToHTML: Correct filtering of text without new line at the end (Milan Crha)
-	alarm-notify: Focus window on status icon click when shown (Milan Crha)
-	ESoupSession: Let it understand GSSAPI authentication method (Milan Crha)
-
 Translations:
-	Marek Černocký (cs)
-	Quentin PAGÈS (oc)
+	Alan Mortensen (da)
+	Balázs Úr (hu)
+	Boyuan Yang (zh_CN)
+	Changwoo Ryu (ko)
+	Charles Monzat (fr)
+	Daniel Șerbănescu (ro)
+	Goran Vidović (hr)
+	Luna Jernberg (sv)
+	Nathan Follens (nl)
+	Philipp Kiemle (de)
+	Piotr Drąg (pl)
+	Zander Brown (en_GB)

-Evolution-Data-Server 3.40.3 2021-07-09
+Evolution-Data-Server 3.41.3 2021-09-03
 ---------------------------------------

 Bug Fixes:
-	I#336 - Handle "Object is out of sync" during backend refresh better (Milan Crha)
+	I#343 - Slow down automatic background downloads when in power saver mode (Milan Crha)
+	I#349 - ERemindersWidget: Reverse order of the shown reminders (Milan Crha)

 Miscellaneous:
-	tests: Workaround libphonenumber behavior change (Milan Crha)
-	test-book-client-write-write: Fix occasional test failure (Milan Crha)
-	IMAPx: Change how Junk and NotJunk flags are handled (Milan Crha)
-	ECalBackendFile: Free interval tree only when being allocated (Milan Crha)
+	vala: FolderThreadNode is a compact class (Corentin Noël)

-Evolution-Data-Server 3.40.2 2021-06-04
+Translations:
+	Daniel Mustieles (es)
+	Asier Sarasua Garmendia (eu)
+	Fran Dieguez (gl)
+	Kukuh Syafaat (id)
+	Baurzhan Muftakhidinov (kk)
+	Jiri Grönroos (fi)
+	Jordi Mas (ca)
+	Nathan Follens (nl)
+	Aurimas Černius (lt)
+
+Evolution-Data-Server 3.41.2 2021-08-13
 ---------------------------------------

 Bug Fixes:
-	I#334 - ECredentialsPrompter: Truncate multiline for pasted passwords (Milan Crha)
-	I#335 - CamelFolder: Calls Junk/Not-Junk learn repeatedly (Milan Crha)
+	I#341 - Pass Proxy settings to WebKit in OAuth2 credentials prompter (Milan Crha)
+	I#346 - Camel: "Pipe to program" filter does not work (Milan Crha)
+	M!72 - Typos its <=> it's (Дилян Палаузов)
+	M!73 - Add more GType for many Camel Flags (Corentin Noël)
+	M!74 - LDAP: Don't force LDAPS port to 636 (Christoph Ruegge)
+	evo-I#1433 - Message List columns for custom headers (Milan Crha)

 Miscellaneous:
-	ECollectionBackend: Fix a memory leak (Milan Crha)
-	gnome_online_accounts_create_client_cb: Prefer g_clear_object() (Milan Crha)
-	Data Factories: Miscellaneous fixes (Milan Crha)
-	ECalCache: Drop timezones_lock (Milan Crha)
-	ECalBackend: Deliver component change notifications in a dedicated thread (Milan Crha)
-	CardDAV: Recognize OPTIONS 'Bad Request' response as success for Google (Milan Crha)
-	Fix e_webdav_session_util_item_href_equal() (Milan Crha)
+	CamelMimeFilterToHTML: Speed up read of long lines (Milan Crha)
+	CamelMimeFilterToHTML: Correct filtering of text without new line at the end (Milan Crha)
+	alarm-notify: Focus window on status icon click when shown (Milan Crha)
+	vala: Add support for the auth_type class field of CamelSasl (Corentin Noël)
+	vala: Properly annotate CamelServiceAuthType (Corentin Noël)
+	ESoupSession: Let it understand GSSAPI authentication method (Milan Crha)

 Translations:
-	Мирослав Николић (sr)
-	Kjartan Maraas (nb)
+	Chao-Hsiung Liao (zh_TW)
+	Rafael Fontenelle (pt_BR)
+	Philipp Kiemle (de)
 	Fabio Tomat (fur)
-	Fran Dieguez (gl)
-	Zander Brown (en_GB)
-	Gianvito Cavasoli (it)
+	Hugo Carvalho (pt)
+	Yuri Chornoivan (uk)
+	Alexey Rubtsov (ru)
+	Enrico Nicoletto (pt_BR)
+	Marek Černocký (cs)
+	Emin Tufan Çetin (tr)
+	Quentin PAGÈS (oc)
+	Matej Urbančič (sl)

-Evolution-Data-Server 3.40.1 2021-04-30
+Evolution-Data-Server 3.41.1 2021-07-09
 ---------------------------------------

 Bug Fixes:
+	I#289 - Support Matrix IM Protocol for Contacts (Milan Crha)
+	I#306 - Camel: Listen for change notifications on spool account (Milan Crha)
 	I#313 - EXmlDocument: Export unformatted text, to save bandwidth (Milan Crha)
 	I#315 - EWebDAVDiscover: Correct error response (Milan Crha)
 	I#316 - vCard: PHOTO/LOGO is a single value attribute (Milan Crha)
 	I#317 - Add OAuth2 for Yahoo! accounts (Milan Crha)
+	I#319 - SMTP: Extra empty line added at the end of the message (Milan Crha)
 	I#323 - Camel: Consider plain words as message ids in In-Reply-To/References headers (Milan Crha)
 	I#326 - libecal: Move Due date relative to the Start date on a recurring task completion (Milan Crha)
 	I#328 - IMAPx: LIST-STATUS is not an extension of the LIST-EXTENDED (Milan Crha)
 	I#329 - Calendar: Add SIMPLE_MEMO_WITH_SUMMARY capability (Milan Crha)
+	I#334 - ECredentialsPrompter: Truncate multiline for pasted passwords (Milan Crha)
+	I#335 - CamelFolder: Calls Junk/Not-Junk learn repeatedly (Milan Crha)
+	I#336 - Handle "Object is out of sync" during backend refresh better (Milan Crha)
 	M!68 - SetupBuildFlags.cmake: Correct testing of two compiler/linker build flags (Matt Turner)
+	M!71 - CamelFolderThread: Use g_clear_object/pointer when possible (Corentin Noël)
 	evo-I#571 - IMAPx QResync: Folder doesn't show all messages actually in it (Milan Crha)
+	evo-I#1499 - ECredentialsPrompter: Ask for dialog parent with the auth_source (Milan Crha)
+	evo-I#1512 - Choose account with which to forward message in filter rule (Milan Crha)

 Miscellaneous:
 	EWebDAVCollectionBackend: Preset also auth method on the new child (Milan Crha)
 	Camel: Fails to filter unread junk messages in a virtual Junk folder (Milan Crha)
+	Add Yahoo! OAuth2 service objects into the developer documentation (Milan Crha)
 	ESourceWebDAV: Fallback to SHA1 on SSL trust verification if needed (Milan Crha)
 	tests: Change how timezone is verified in CalMetaBackend test (Milan Crha)
 	Ensure non-const pointers passed to I_CAL_IS_... functions (Milan Crha)
@@ -76,26 +104,49 @@ Miscellaneous:
 	ECalBackendSync: Ensure no Recurrence-ID set when removing all components (Milan Crha)
 	PrintableOptions.cmake: Correct variable name comparison (Milan Crha)
 	libecal: Fix a warning caught by a gcc static analyzer (Milan Crha)
+	ECollectionBackend: Fix a memory leak (Milan Crha)
+	gnome_online_accounts_create_client_cb: Prefer g_clear_object() (Milan Crha)
+	Data Factories: Miscellaneous fixes (Milan Crha)
+	ECalCache: Drop timezones_lock (Milan Crha)
+	ECalBackend: Deliver component change notifications in a dedicated thread (Milan Crha)
+	CardDAV: Recognize OPTIONS 'Bad Request' response as success for Google (Milan Crha)
+	Fix e_webdav_session_util_item_href_equal() (Milan Crha)
+	Addressbook: Switch from GData Contacts API to CardDAV API for Google books (Milan Crha)
+	Camel: Stop using allow-none annotation (Corentin Noël)
+	Introspection: Get rid of allow-none (Corentin Noël)
+	CamelMimeFilterEnriched: Add safety checks into enriched_to_html() (Milan Crha)
+	Calendar: Support THIS_AND_FUTURE range for the Recurrence-ID (Milan Crha)
+	Calendar: Improve the annotation coverage (Corentin Noël)
+	tests: Workaround libphonenumber behavior change (Milan Crha)
+	test-book-client-write-write: Fix occasional test failure (Milan Crha)
+	IMAPx: Change how Junk and NotJunk flags are handled (Milan Crha)
+	ECalBackendFile: Free interval tree only when being allocated (Milan Crha)
+	Calendar: Drop leftover GDataClientLogin reference in the gtasks backend (Milan Crha)

 Translations:
+	Alexey Rubtsov (ru)
+	Asier Sarasua Garmendia (eu)
+	Aurimas Černius (lt)
 	Bruce Cowan (en_GB)
-	Gianvito Cavasoli (it)
-	Nathan Follens (nl)
 	Chao-Hsiung Liao (zh_TW)
-	Yuri Chornoivan (uk)
-	Matej Urbančič (sl)
-	Hugo Carvalho (pt)
-	Enrico Nicoletto (pt_BR)
+	Charles Monzat (fr)
+	Daniel Mustieles (es)
 	Daniel Șerbănescu (ro)
-	Asier Sarasua Garmendia (eu)
-	Aurimas Černius (lt)
+	Emin Tufan Çetin (tr)
+	Enrico Nicoletto (pt_BR)
+	Fabio Tomat (fur)
+	Florentina Mușat (ro)
+	Fran Dieguez (gl)
+	Gianvito Cavasoli (it)
+	Hugo Carvalho (pt)
+	Kjartan Maraas (nb)
+	Luna Jernberg (sv)
+	Nathan Follens (nl)
 	Piotr Drąg (pl)
-	Daniel Mustieles (es)
 	Tim Sabsch (de)
-	Charles Monzat (fr)
-	Kukuh Syafaat (id)
-	Luna Jernberg (sv)
-	Emin Tufan Çetin (tr)
+	Yuri Chornoivan (uk)
+	Zander Brown (en_GB)
+	Мирослав Николић (sr)

 Evolution-Data-Server 3.40.0 2021-03-19
 ---------------------------------------

--- a/cmake/modules/GObjectIntrospection.cmake
+++ b/cmake/modules/GObjectIntrospection.cmake
@@ -115,7 +115,7 @@ macro(gir_add_introspection gir)
 		_gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=")
 		_gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=")

-		# Reuse the LIBTOOL variable from by automake if it's set
+		# Reuse the LIBTOOL variable from automake if it's set
 		set(_gir_libtool "--no-libtool")

 		_gir_list_prefix_path_to_string(_gir_files ${${_gir_name}_FILES} "${CMAKE_CURRENT_SOURCE_DIR}")

--- a/config.h.in
+++ b/config.h.in
@@ -199,3 +199,6 @@

 /* evolution-alarm-notify - Define if using Canberra-GTK for sound */
 #cmakedefine HAVE_CANBERRA 1
+
+/* Whether glib provides GPowerProfileMonitor */
+#cmakedefine HAVE_GPOWERPROFILEMONITOR 1
--- a/data/org.gnome.evolution-data-server.gschema.xml.in
+++ b/data/org.gnome.evolution-data-server.gschema.xml.in
@@ -19,6 +19,11 @@
      <_summary>Override SMTP HELO/EHLO argument</_summary>
      <_description>When not empty, it's used as the SMTP HELO/EHLO argument, instead of the local host name/IP.</_description>
    </key>
+    <key name="camel-message-info-user-headers" type="as">
+      <default>[]</default>
+      <_summary>Array of user header names</_summary>
+      <_description>These headers can be stored in the folder summary, eventually being visible in the GUI. The value can contain a pipe character ('|'), which delimits the display name from the header name. Example: 'Span Score|X-Spam-Score'</_description>
+    </key>
    <key name="network-monitor-gio-name" type="s">
      <default>''</default>
      <_summary>GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance</_summary>

--- a/docs/reference/camel/camel-docs.sgml.in
+++ b/docs/reference/camel/camel-docs.sgml.in
@@ -152,6 +152,7 @@
      <xi:include href="xml/camel-sasl-xoauth2.xml"/>
      <xi:include href="xml/camel-sasl-xoauth2-google.xml"/>
      <xi:include href="xml/camel-sasl-xoauth2-outlook.xml"/>
+      <xi:include href="xml/camel-sasl-xoauth2-yahoo.xml"/>
    </chapter>

    <chapter id="MIME">
@@ -297,6 +298,10 @@
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
+  <index id="api-index-3-42" role="3.42">
+    <title>Index of new symbols in 3.42</title>
+    <xi:include href="xml/api-index-3.42.xml"><xi:fallback /></xi:include>
+  </index>
  <index id="api-index-3-40" role="3.40">
    <title>Index of new symbols in 3.40</title>
    <xi:include href="xml/api-index-3.40.xml"><xi:fallback /></xi:include>

--- a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
+++ b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
@@ -269,6 +269,7 @@
      <xi:include href="xml/e-oauth2-service-base.xml"/>
      <xi:include href="xml/e-oauth2-service-google.xml"/>
      <xi:include href="xml/e-oauth2-service-outlook.xml"/>
+      <xi:include href="xml/e-oauth2-service-yahoo.xml"/>
    </chapter>

    <chapter>
@@ -360,6 +361,10 @@
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
+  <index id="api-index-3-42" role="3.42">
+    <title>Index of new symbols in 3.42</title>
+    <xi:include href="xml/api-index-3.42.xml"><xi:fallback /></xi:include>
+  </index>
  <index id="api-index-3-40" role="3.40">
    <title>Index of new symbols in 3.40</title>
    <xi:include href="xml/api-index-3.40.xml"><xi:fallback /></xi:include>

--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,6 @@
 src/addressbook/backends/carddav/e-book-backend-carddav.c
 src/addressbook/backends/file/e-book-backend-file.c
 src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
-src/addressbook/backends/google/e-book-backend-google.c
-src/addressbook/backends/google/e-book-google-utils.c
 src/addressbook/backends/ldap/e-book-backend-ldap.c
 src/addressbook/libebook-contacts/e-book-contacts-utils.c
 src/addressbook/libebook-contacts/e-contact.c

--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po