projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes NB#133759, do allow sending messages without subject
[modest]
/
src
/
modest-formatter.c
diff --git
a/src/modest-formatter.c
b/src/modest-formatter.c
index
a503ed7
..
dd1efe0
100644
(file)
--- a/
src/modest-formatter.c
+++ b/
src/modest-formatter.c
@@
-106,6
+106,9
@@
extract_text (ModestFormatter *self, TnyMimePart *body)
break;
n_read = tny_stream_read (input_stream, buffer, next_read);
break;
n_read = tny_stream_read (input_stream, buffer, next_read);
+ if (G_UNLIKELY (n_read < 0))
+ break;
+
offset = buffer;
while (offset < buffer + n_read) {
offset = buffer;
while (offset < buffer + n_read) {
@@
-475,7
+478,7
@@
find_body_parent (TnyMimePart *part)
msg_content_type = tny_mime_part_get_content_type (part);
if ((msg_content_type != NULL) &&
msg_content_type = tny_mime_part_get_content_type (part);
if ((msg_content_type != NULL) &&
- (!g_strcasecmp (msg_content_type, "multipart/alternative")))
+ (!g_ascii_strcasecmp (msg_content_type, "multipart/alternative")))
return g_object_ref (part);
else if ((msg_content_type != NULL) &&
(g_str_has_prefix (msg_content_type, "multipart/"))) {
return g_object_ref (part);
else if ((msg_content_type != NULL) &&
(g_str_has_prefix (msg_content_type, "multipart/"))) {
@@
-488,10
+491,10
@@
find_body_parent (TnyMimePart *part)
while (!tny_iterator_is_done (iter)) {
TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
while (!tny_iterator_is_done (iter)) {
TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (part && !g_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
+ if (part && !g_ascii_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
alternative_part = part;
break;
alternative_part = part;
break;
- } else if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
+ } else if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
related_part = part;
break;
}
related_part = part;
break;
}