** Fixes bug #383953

2007-04-06  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #383953

	* em-folder-properties.c (emfp_get_folder_item):
	Show unread messages before total messages.

	* mail-component.c (view_changed):
	Show unread or selected messages before total messages.


svn path=/trunk/; revision=33396

3 files changed, 20 insertions, 9 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b4e892855b..6e3d30ebe9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,15 @@
 2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
 
+	** Fixes bug #383953
+
+	* em-folder-properties.c (emfp_get_folder_item):
+	Show unread messages before total messages.
+
+	* mail-component.c (view_changed):
+	Show unread or selected messages before total messages.
+
+2007-04-06  Matthew Barnes  <mbarnes@redhat.com>
+
 	* message-list.c: More intelligent message selection.  (#332765)
 	Patch from Christof Krüger
 
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index a278fa3b43..4b1aabade3 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -145,27 +145,27 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 	gtk_widget_show (table);
 	gtk_box_pack_start ((GtkBox *) parent, table, TRUE, TRUE, 0);
 
-	/* TODO: can this be done in a loop? */
 	/* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */
-	label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total));
+	label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
 	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 	
-	sprintf(countstr, "%d", prop_data->total);
+	sprintf(countstr, "%d", prop_data->unread);
 	label = gtk_label_new (countstr);
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
 	gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	row++;
 
+	/* TODO: can this be done in a loop? */
 	/* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */
-	label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread));
+	label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
 	gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 	
-	sprintf(countstr, "%d", prop_data->unread);
+	sprintf(countstr, "%d", prop_data->total);
 	label = gtk_label_new (countstr);
 	gtk_widget_show (label);
 	gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5);
diff --git a/mail/mail-component.c b/mail/mail-component.c
index c91096eec0..4f06665fa9 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -544,6 +544,9 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
 			    || g_ascii_strcasecmp(emfv->folder->full_name, ".") == 0)
 				bits |= 8;
 
+			if (selected->len > 1)
+				g_string_append_printf(tmp, ngettext ("%d selected, ", "%d selected, ", selected->len), selected->len);
+
 			if (bits == 1)
 				g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible);
 			else if (bits == 2)
@@ -553,13 +556,11 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
 			else {
 				if (!emfv->hide_deleted)
 					visible += deleted;
+				if (unread && selected->len <= 1)
+					g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread);
 				g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible);
-				if (unread && selected->len <=1)
-					g_string_append_printf(tmp, ngettext (", %d unread", ", %d unread", unread), unread);
 			}
 
-			if (selected->len > 1)
-				g_string_append_printf(tmp, ngettext (", %d selected", ", %d selected", selected->len), selected->len);
 			message_list_free_uids(emfv->list, selected);
 		}