From f789d26e372c68692d084086969721641c00c1d8 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Sat, 2 Sep 2023 22:29:07 +0200 Subject: [PATCH] LibIMAP+Mail: Rename MultiPartBody's mime_type to multipart_subtype --- Userland/Applications/Mail/MailWidget.cpp | 2 +- Userland/Libraries/LibIMAP/Objects.h | 2 +- Userland/Libraries/LibIMAP/Parser.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Applications/Mail/MailWidget.cpp b/Userland/Applications/Mail/MailWidget.cpp index 6b399c8b26..b5ae365a05 100644 --- a/Userland/Applications/Mail/MailWidget.cpp +++ b/Userland/Applications/Mail/MailWidget.cpp @@ -185,7 +185,7 @@ void MailWidget::on_window_close() IMAP::MultiPartBodyStructureData const* MailWidget::look_for_alternative_body_structure(IMAP::MultiPartBodyStructureData const& current_body_structure, Vector& position_stack) const { - if (current_body_structure.media_type.equals_ignoring_ascii_case("ALTERNATIVE"sv)) + if (current_body_structure.multipart_subtype.equals_ignoring_ascii_case("ALTERNATIVE"sv)) return ¤t_body_structure; u32 structure_index = 1; diff --git a/Userland/Libraries/LibIMAP/Objects.h b/Userland/Libraries/LibIMAP/Objects.h index 7bb5a8087b..2757078120 100644 --- a/Userland/Libraries/LibIMAP/Objects.h +++ b/Userland/Libraries/LibIMAP/Objects.h @@ -198,7 +198,7 @@ struct MultiPartBodyStructureData { Optional>> disposition; Vector> bodies; Vector langs; - DeprecatedString media_type; + DeprecatedString multipart_subtype; Optional> params; Optional location; Optional> extensions; diff --git a/Userland/Libraries/LibIMAP/Parser.cpp b/Userland/Libraries/LibIMAP/Parser.cpp index ae17ee70cf..cbe2971f76 100644 --- a/Userland/Libraries/LibIMAP/Parser.cpp +++ b/Userland/Libraries/LibIMAP/Parser.cpp @@ -384,7 +384,7 @@ BodyStructure Parser::parse_body_structure() data.bodies.append(make(move(child))); } consume(" "sv); - data.media_type = parse_string(); + data.multipart_subtype = parse_string(); if (!try_consume(")"sv)) { consume(" "sv);