aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-send-recv.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8262d7520f..890fa12189 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-15 Lucian Langa <lucilanga@gnome.org>
+
+ ** Fixes bug #564519
+
+ * mail-send-recv.c: (build_dialog):
+ Count also deleted unsent messages when displaying SMTP server
+
2008-12-13 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #564351 (patch by Tal Benavidor)
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index d2447d76b7..d957a7d216 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -416,7 +416,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
g_object_unref (iter);
/* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */
- if (outbox && destination && camel_folder_get_message_count (outbox) == 0)
+ if (outbox && destination
+ && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0)
num_sources--;
table = gtk_table_new (num_sources, 4, FALSE);
@@ -544,7 +545,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
/* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */
- if (outbox && destination && camel_folder_get_message_count (outbox) != 0) {
+ if (outbox && destination
+ && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) {
info = g_hash_table_lookup (data->active, SEND_URI_KEY);
if (info == NULL) {
info = g_malloc0 (sizeof (*info));