diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/em-format-html.c | 2 | ||||
| -rw-r--r-- | mail/message-list.c | 20 |
3 files changed, 9 insertions, 21 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 361675de7c..e623ff080d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,13 @@ 2008-05-22 Matthew Barnes <mbarnes@redhat.com> + * em-format-html.c (efh_message_external): + Fix a typo in checking for an empty 'mode' string. + + * message-list.c (subtree_size): + Remove this function. Looks like it hasn't been used in years. + +2008-05-22 Matthew Barnes <mbarnes@redhat.com> + ** Fixes part of bug #534360 * em-account-prefs.h: diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 467d84c0e6..dc656d56f1 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -950,7 +950,7 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part else path = g_strdup_printf("/%s", *name=='/'?name+1:name); - if (mode && &mode) + if (mode && *mode) sprintf(ftype, ";type=%c", *mode); else ftype[0] = 0; diff --git a/mail/message-list.c b/mail/message-list.c index 76586d6606..b23cc1c160 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1147,26 +1147,6 @@ subtree_unread(MessageList *ml, ETreePath node) return FALSE; } -static int -subtree_size(MessageList *ml, ETreePath node) -{ - CamelMessageInfo *info; - int size = 0; - ETreePath child; - - while (node) { - info = e_tree_memory_node_get_data((ETreeMemory *)ml->model, node); - g_return_val_if_fail (info != NULL, 0); - - size += camel_message_info_size(info); - if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->model), node))) - size += subtree_size(ml, child); - - node = e_tree_model_node_get_next (ml->model, node); - } - return size; -} - static time_t subtree_latest(MessageList *ml, ETreePath node, int sent) { |