From daf1f8f98046cc8aa43e225635ea3c6510249377 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 21 May 2008 16:03:33 +0000 Subject: [PATCH] * src/maemo/modest-msg-view-window.c: * Improve a bit msg_is_visible to only call one time to all send queues to get a header status. pmo-trunk-r4555 --- src/maemo/modest-msg-view-window.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 3018a45..f470427 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -1634,11 +1634,16 @@ modest_msg_view_window_is_search_result (ModestMsgViewWindow *window) static gboolean msg_is_visible (TnyHeader *header, gboolean check_outbox) { - return (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) && - ( (!check_outbox) || - ((modest_tny_all_send_queues_get_msg_status (header) != MODEST_TNY_SEND_QUEUE_FAILED) && - (modest_tny_all_send_queues_get_msg_status (header) != MODEST_TNY_SEND_QUEUE_SENDING))) ; - + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + return FALSE; + if (!check_outbox) { + return TRUE; + } else { + ModestTnySendQueueStatus status; + status = modest_tny_all_send_queues_get_msg_status (header); + return ((status != MODEST_TNY_SEND_QUEUE_FAILED) && + (status != MODEST_TNY_SEND_QUEUE_SENDING)); + } } gboolean -- 1.7.9.5