evolution r36879 - trunk/mail

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Dec 15 06:05:10 2008
New Revision: 36879
URL: http://svn.gnome.org/viewvc/evolution?rev=36879&view=rev

Log:
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

Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-send-recv.c

Modified: trunk/mail/mail-send-recv.c
==============================================================================
--- trunk/mail/mail-send-recv.c	(original)
+++ trunk/mail/mail-send-recv.c	Mon Dec 15 06:05:10 2008
@@ -416,7 +416,8 @@
 	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 @@
 	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));