* msgbase.c: allow multipart/alternative part-swapping only at the top

  level, because if we recursed into another one then it's going to stomp
  all over our preferred part.  (even more uuuuunnnhhhhh...)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 118fcb27645ceaa77e77edce08a9ebada3c9a419..5aa931f6c6f81531882931466ae5f84283f1d04c 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 22 00:48:47 EDT 2005 ajc
+* msgbase.c: allow multipart/alternative part-swapping only at the top
+  level, because if we recursed into another one then it's going to stomp
+  all over our preferred part.  (even more uuuuunnnhhhhh...)
+
 Sat Oct 22 00:46:52 EDT 2005 ajc
 * mime_parser.c: recurse into message/rfc822 parts as if they were
   multipart, because we may need to extract attachments from the embedded

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 31ccb60d6c32f4ade3d8b1540158c0626bbb0e91..cb11932aa681b931822b0689821f257cef82bb65 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1169,8 +1169,6 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp,
                        extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
                        if (!strcasecmp(buf, cbtype)) {
                                if (num_tokens(partnum, '.') < 3) {
-                                       lprintf(CTDL_DEBUG, "REPLACING MA <%s> WITH <%s>\n",
-                                               ma->chosen_part, partnum);
                                        safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part);
                                }
                        }