[evolution] Don't show total attachment size if it's zero.



commit 27988a2b71e00a8f7a12f67a187c98bdbbfd9126
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Jan 28 12:32:48 2010 -0500

    Don't show total attachment size if it's zero.

 mail/e-mail-attachment-bar.c      |   13 +++++++++----
 widgets/misc/e-attachment-paned.c |   13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 6b50aac..8461faf 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -114,10 +114,15 @@ mail_attachment_bar_update_status (EMailAttachmentBar *bar)
 	total_size = e_attachment_store_get_total_size (store);
 	display_size = g_format_size_for_display (total_size);
 
-	markup = g_strdup_printf (
-		"<b>%d</b> %s (%s)", num_attachments, ngettext (
-		"Attachment", "Attachments", num_attachments),
-		display_size);
+	if (total_size > 0)
+		markup = g_strdup_printf (
+			"<b>%d</b> %s (%s)", num_attachments, ngettext (
+			"Attachment", "Attachments", num_attachments),
+			display_size);
+	else
+		markup = g_strdup_printf (
+			"<b>%d</b> %s", num_attachments, ngettext (
+			"Attachment", "Attachments", num_attachments));
 	gtk_label_set_markup (label, markup);
 	g_free (markup);
 
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index 8cdfe6c..519d407 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -142,10 +142,15 @@ attachment_paned_update_status (EAttachmentPaned *paned)
 	total_size = e_attachment_store_get_total_size (store);
 	display_size = g_format_size_for_display (total_size);
 
-	markup = g_strdup_printf (
-		"<b>%d</b> %s (%s)", num_attachments, ngettext (
-		"Attachment", "Attachments", num_attachments),
-		display_size);
+	if (total_size > 0)
+		markup = g_strdup_printf (
+			"<b>%d</b> %s (%s)", num_attachments, ngettext (
+			"Attachment", "Attachments", num_attachments),
+			display_size);
+	else
+		markup = g_strdup_printf (
+			"<b>%d</b> %s", num_attachments, ngettext (
+			"Attachment", "Attachments", num_attachments));
 	gtk_label_set_markup (label, markup);
 	g_free (markup);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]