Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made encoding detection actually work. Added a deprecation notice in E-mail.h.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9932 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Nathan Whitehorn 2004-11-11 23:17:48 +00:00
parent 9ad2b1324f
commit 5344cdf47b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/os/mail/E-mail.h
View File

@ -41,8 +41,12 @@ enum mail_flags {B_MAIL_PENDING = 1, /* waiting to be sent*/
#define B_MAIL_TYPE "text/x-email" /* mime type*/ #define B_MAIL_TYPE "text/x-email" /* mime type*/
/* Everything past this point is deprecated. See MailMessage.h, mail_encoding.h
and MailDaemon.h for alternatives. */
/* DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED */
/* DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED */
/* -----------------------------------------------------------------------*/
/* defines...*/ /* defines...*/
/* schedule days */ /* schedule days */
@ -87,7 +91,6 @@ typedef struct {
bool beep; bool beep;
} mail_notification; } mail_notification;
/* -----------------------------------------------------------------------*/ /* -----------------------------------------------------------------------*/
/* global functions...*/ /* global functions...*/

4
headers/os/mail/mail_encoding.h
View File

@ -10,9 +10,9 @@
#include <sys/types.h> #include <sys/types.h>
#define B_MAIL_NULL_CONVERSION ((uint32) -1) #define B_MAIL_UTF8_CONVERSION ((uint32) -1)
#define B_MAIL_UTF8_CONVERSION ((uint32) -2)
// For specifying the UTF-8 character set when converting to/from UTF-8. // For specifying the UTF-8 character set when converting to/from UTF-8.
#define B_MAIL_NULL_CONVERSION ((uint32) -2)
#define B_MAIL_US_ASCII_CONVERSION ((uint32) -3) #define B_MAIL_US_ASCII_CONVERSION ((uint32) -3)
// Plain 7 bit ASCII character set. A subset of UTF-8, but some mail software // Plain 7 bit ASCII character set. A subset of UTF-8, but some mail software
// specifies it so we need to recognize it. // specifies it so we need to recognize it.

1
src/kits/mail/mail_util.cpp
View File

@ -401,7 +401,6 @@ _EXPORT ssize_t rfc2047_to_utf8(char **bufp, size_t *bufLen, size_t strLen)
convert_id = cs->GetConversionID(); convert_id = cs->GetConversionID();
} }
} }
if (convert_id == B_MAIL_NULL_CONVERSION) if (convert_id == B_MAIL_NULL_CONVERSION)
{ {
// unidentified charset // unidentified charset