diff options
Diffstat (limited to 'libmail')
| -rw-r--r-- | libmail/nntp.C | 10 | ||||
| -rw-r--r-- | libmail/rfcaddr.C | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libmail/nntp.C b/libmail/nntp.C index 3f7d92d..0ef8203 100644 --- a/libmail/nntp.C +++ b/libmail/nntp.C @@ -761,7 +761,7 @@ bool mail::nntp::fixGenericMessageNumber(std::string uid, size_t &msgNum) } --msgNum; } - + while (n > index[msgNum].msgNum) if (++msgNum >= cnt) { @@ -1135,8 +1135,8 @@ void mail::nntp::searchMessages(const searchParams &searchInfo, char *p; size_t psize; - h=unicode_convert_fromu_init("iso-8859-1", - &p, &psize, 1); + h=unicode_convert_fromu_init("utf-8", + &p, &psize, 1); if (h) { @@ -1314,7 +1314,7 @@ bool mail::nntp::genericCachedUid(string uid) { return genericTmpFp && uid == cachedUid; } - + void mail::nntp::genericGetMessageStruct(string uid, size_t messageNumber, struct rfc2045 *&structRet, @@ -1395,7 +1395,7 @@ void mail::nntp::Task::done() throw; } - + myserver=NULL; delete this; } diff --git a/libmail/rfcaddr.C b/libmail/rfcaddr.C index 082cccb..0f4d39b 100644 --- a/libmail/rfcaddr.C +++ b/libmail/rfcaddr.C @@ -163,7 +163,7 @@ string mail::address::getCanonAddress() const { a=a.substr(0, n) + mail::iconvert::convert_tocase(a.substr(n), - "iso-8859-1", + "utf-8", unicode_lc); } @@ -402,7 +402,7 @@ void mail::emailAddress::decode() for (std::string::iterator b=addr.begin(), e=addr.end(); b != e; ++b) ucaddr.push_back((unsigned char)*b); - + #if LIBIDN size_t at=std::find(ucaddr.begin(), ucaddr.end(), '@') - ucaddr.begin(); @@ -439,4 +439,3 @@ void mail::emailAddress::decode() decodedName=ucname; decodedAddr=ucaddr; } - |