[balsa/75-html-display-printing] use more appropriate function names for multipart/alternative selection



commit 2f7492c335d64cb682c64b7297c966d134f4c7ab
Author: Albrecht Dreß <albrecht dress netcologne de>
Date:   Thu May 5 21:30:06 2022 +0200

    use more appropriate function names for multipart/alternative selection
    
    rename libbalsa_message_body_[gs]et_html_selected() to
    libbalsa_message_body_[g]et_mp_alt_selection() (thanks to @peterb for
    this proposal).
    
    Signed-off-by: Albrecht Dreß <albrecht dress netcologne de>

 libbalsa/body.c     | 4 ++--
 libbalsa/body.h     | 8 ++++----
 src/balsa-message.c | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libbalsa/body.c b/libbalsa/body.c
index 0dcb5f243..f0a56a967 100644
--- a/libbalsa/body.c
+++ b/libbalsa/body.c
@@ -997,7 +997,7 @@ find_mp_alt_parent(const LibBalsaMessageBody *body)
  * @sa find_mp_alt_parent(), libbalsa_html_type()
  */
 void
-libbalsa_message_body_set_html_selected(LibBalsaMessageBody *body)
+libbalsa_message_body_set_mp_alt_selection(LibBalsaMessageBody *body)
 {
        LibBalsaMessageBody *mp_alt_body;
 
@@ -1026,7 +1026,7 @@ libbalsa_message_body_set_html_selected(LibBalsaMessageBody *body)
  * @sa find_mp_alt_parent()
  */
 LibBalsaMpAltSelection
-libbalsa_message_body_get_html_selected(LibBalsaMessageBody *body)
+libbalsa_message_body_get_mp_alt_selection(LibBalsaMessageBody *body)
 {
        LibBalsaMessageBody *mp_alt_body;
        LibBalsaMpAltSelection result = LIBBALSA_MP_ALT_AUTO;
diff --git a/libbalsa/body.h b/libbalsa/body.h
index 58a03dd68..45193c577 100644
--- a/libbalsa/body.h
+++ b/libbalsa/body.h
@@ -147,11 +147,11 @@ LibBalsaMessageBody *libbalsa_message_body_get_by_id(LibBalsaMessageBody *
 LibBalsaMessageBody *libbalsa_message_body_mp_related_root(LibBalsaMessageBody *body);
 
 #ifdef HAVE_HTML_WIDGET
-void libbalsa_message_body_set_html_selected(LibBalsaMessageBody *body);
-LibBalsaMpAltSelection libbalsa_message_body_get_html_selected(LibBalsaMessageBody *body);
+void libbalsa_message_body_set_mp_alt_selection(LibBalsaMessageBody *body);
+LibBalsaMpAltSelection libbalsa_message_body_get_mp_alt_selection(LibBalsaMessageBody *body);
 #else
-#define libbalsa_message_body_set_html_selected(x)
-#define libbalsa_message_body_get_html_selected(x)     LIBBALSA_MP_ALT_AUTO
+#define libbalsa_message_body_set_mp_alt_selection(x)
+#define libbalsa_message_body_get_mp_alt_selection(x)  LIBBALSA_MP_ALT_AUTO
 #endif /*HAVE_HTML_WIDGET*/
 
 guint libbalsa_message_body_protect_mode(const LibBalsaMessageBody * body);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index e69c4bf95..d7bf39888 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -2019,7 +2019,7 @@ libbalsa_can_display(LibBalsaMessageBody *part, InternetAddressList *from)
        if (strcmp(content_type, "multipart/related") == 0) {
                res = (part->parts != NULL) ? libbalsa_can_display(part->parts, from) : FALSE;
        } else {
-               switch (libbalsa_message_body_get_html_selected(part)) {
+               switch (libbalsa_message_body_get_mp_alt_selection(part)) {
                case LIBBALSA_MP_ALT_AUTO:
                        res = (!balsa_app.display_alt_plain || libbalsa_html_get_prefer_html(from)) &&
                                (libbalsa_html_type(content_type) != LIBBALSA_HTML_TYPE_NONE);
@@ -2291,7 +2291,7 @@ select_part(BalsaMessage * balsa_message, BalsaPartInfo *info)
     body = add_part(balsa_message, info,
                     balsa_mime_widget_get_container(balsa_message->bm_widget));
     balsa_message->current_part = part_info_from_body(balsa_message, body);
-    libbalsa_message_body_set_html_selected(body);
+    libbalsa_message_body_set_mp_alt_selection(body);
 
     g_signal_emit(balsa_message, balsa_message_signals[SELECT_PART], 0);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]