Merge branch 'prime'

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([gromox], [2.32])
+AC_INIT([gromox], [2.33])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux])
 AC_PREFIX_DEFAULT([/usr])

doc/changelog.rst

@@ -1,9 +1,12 @@
-Development 2.32.49
-===================
+Gromox 2.33 (2024-10-01)
+========================
 
 Fixes:
 
-* oxdisco: allow retrieval of TB Autoconfig XML without authentication
+* oxdisco: serve TB Autoconfig XML without requiring authentication
+  (clients do not expect it to be protected)
+* oxcical: revert commit which evaluates different MAPI timezone properties to
+  generate DTSTART/DTEND's TZID value
 
 Enhancements:
 

doc/known_bugs.rst

@@ -1,6 +1,18 @@
 
-Known Bugs for Developers
-=========================
+Known incompatibilities involving third-party software.
+
+
+Noteworthy issues for administrators and packagers
+==================================================
+
+* Due to https://gitlab.gnome.org/GNOME/libxml2/-/issues/508 ,
+  libxml2 versions 2.9.11 <= v < 2.11.0 cause HTML e-mail message bodies to
+  change <o:p> to <p>, which causes the insertion of extraneous empty lines
+  upon reception of e-mail.
+
+
+Noteworthy issues for developers
+================================
 
 * xfce4-terminal (more generally, everything libvte-based?): when using
   xfce4-terminal's paste functionality, certain characters can get eaten if and

lib/mapi/oxcmail.cpp

@@ -2628,12 +2628,16 @@ MESSAGE_CONTENT *oxcmail_import(const char *charset, const char *str_zone,
 	    !oxcmail_parse_message_body(default_charset.c_str(),
 	    mime_enum.pplain, &pmsg->proplist))
 		return imp_null;
-	if (mime_enum.htmls.size() > 0) {
+	if (mime_enum.htmls.size() > 1) {
 		assert(mime_enum.hjoin.size() >= mime_enum.htmls.size());
 		auto err = bodyset_multi(mime_enum, pmsg->proplist,
 		           default_charset.c_str());
 		if (err != 0)
 			return imp_null;
+	} else if (mime_enum.htmls.size() > 0) {
+		if (!oxcmail_parse_message_body(default_charset.c_str(),
+		    mime_enum.htmls.front(), &pmsg->proplist))
+			return imp_null;
 	} else if (NULL != mime_enum.penriched) {
 		if (!oxcmail_parse_message_body(default_charset.c_str(),
 		    mime_enum.penriched, &pmsg->proplist))