Diffstat (limited to 'kmicromail/libmailwrapper/abstractmail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 8ee112c..ed5c898 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp | |||
@@ -55,72 +55,73 @@ AbstractMail* AbstractMail::getWrapper(Account*a) | |||
55 | break; | 55 | break; |
56 | default: | 56 | default: |
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) | 61 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) |
62 | { | 62 | { |
63 | // odebug << "Decode string start" << oendl; | 63 | // odebug << "Decode string start" << oendl; |
64 | char*result_text; | 64 | char*result_text; |
65 | size_t index = 0; | 65 | size_t index = 0; |
66 | /* reset for recursive use! */ | 66 | /* reset for recursive use! */ |
67 | size_t target_length = 0; | 67 | size_t target_length = 0; |
68 | result_text = 0; | 68 | result_text = 0; |
69 | int mimetype = MAILMIME_MECHANISM_7BIT; | 69 | int mimetype = MAILMIME_MECHANISM_7BIT; |
70 | if (enc.lower()=="quoted-printable") { | 70 | if (enc.lower()=="quoted-printable") { |
71 | mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; | 71 | mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; |
72 | } else if (enc.lower()=="base64") { | 72 | } else if (enc.lower()=="base64") { |
73 | mimetype = MAILMIME_MECHANISM_BASE64; | 73 | mimetype = MAILMIME_MECHANISM_BASE64; |
74 | } else if (enc.lower()=="8bit") { | 74 | } else if (enc.lower()=="8bit") { |
75 | mimetype = MAILMIME_MECHANISM_8BIT; | 75 | mimetype = MAILMIME_MECHANISM_8BIT; |
76 | } else if (enc.lower()=="binary") { | 76 | } else if (enc.lower()=="binary") { |
77 | mimetype = MAILMIME_MECHANISM_BINARY; | 77 | mimetype = MAILMIME_MECHANISM_BINARY; |
78 | } | 78 | } |
79 | |||
80 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, | 79 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, |
81 | &result_text,&target_length); | 80 | &result_text,&target_length); |
82 | 81 | ||
83 | encodedString* result = new encodedString(); | 82 | encodedString* result = new encodedString(); |
84 | if (err == MAILIMF_NO_ERROR) { | 83 | if (err == MAILIMF_NO_ERROR) { |
85 | result->setContent(result_text,target_length); | 84 | result->setContent(result_text,target_length); |
86 | } | 85 | } |
87 | //odebug << "Decode string finished" << oendl; | 86 | //odebug << "Decode string finished" << oendl; |
88 | return result; | 87 | return result; |
89 | } | 88 | } |
90 | 89 | ||
91 | QString AbstractMail::convert_String(const char*text) | 90 | QString AbstractMail::convert_String(const char*text) |
92 | { | 91 | { |
93 | size_t index = 0; | 92 | size_t index = 0; |
94 | char*res = 0; | 93 | char*res = 0; |
95 | int err = MAILIMF_NO_ERROR; | 94 | int err = MAILIMF_NO_ERROR; |
96 | 95 | ||
97 | QString result(text); | 96 | QString result(text); |
98 | 97 | //qDebug("convert_String %s ", text); | |
98 | //err = mailmime_encoded_phrase_parse("iso-8859-1", | ||
99 | // text, strlen(text),&index, "iso-8859-1",&res); | ||
99 | err = mailmime_encoded_phrase_parse("iso-8859-1", | 100 | err = mailmime_encoded_phrase_parse("iso-8859-1", |
100 | text, strlen(text),&index, "iso-8859-1",&res); | 101 | text, strlen(text),&index, "utf-8",&res); |
101 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 102 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
102 | result = QString(res); | 103 | result = QString::fromUtf8(res); |
103 | } | 104 | } |
104 | //qDebug("convert_String:%s ",result.latin1() ); | 105 | //qDebug("convert_String:%s ",result.latin1() ); |
105 | if (res) free(res); | 106 | if (res) free(res); |
106 | return result; | 107 | return result; |
107 | } | 108 | } |
108 | 109 | ||
109 | /* cp & paste from launcher */ | 110 | /* cp & paste from launcher */ |
110 | QString AbstractMail::gen_attachment_id() | 111 | QString AbstractMail::gen_attachment_id() |
111 | { | 112 | { |
112 | QFile file( "/proc/sys/kernel/random/uuid" ); | 113 | QFile file( "/proc/sys/kernel/random/uuid" ); |
113 | if (!file.open(IO_ReadOnly ) ) | 114 | if (!file.open(IO_ReadOnly ) ) |
114 | return QString::null; | 115 | return QString::null; |
115 | 116 | ||
116 | QTextStream stream(&file); | 117 | QTextStream stream(&file); |
117 | 118 | ||
118 | return "{" + stream.read().stripWhiteSpace() + "}"; | 119 | return "{" + stream.read().stripWhiteSpace() + "}"; |
119 | } | 120 | } |
120 | 121 | ||
121 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) | 122 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) |
122 | { | 123 | { |
123 | return 0; | 124 | return 0; |
124 | } | 125 | } |
125 | 126 | ||
126 | QString AbstractMail::defaultLocalfolder() | 127 | QString AbstractMail::defaultLocalfolder() |