callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Fixes bug #383953

Browse Source 
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
This commit is contained in:
Matthew Barnes
2007-04-07 02:46:46 +00:00
committed by Matthew Barnes
parent 271d15aab6
commit 6f9d514d20
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mail/ChangeLog
View File

@ -1,3 +1,13 @@
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)

26
mail/em-folder-properties.c
View File

@ -145,6 +145,19 @@ 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);
/* 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));
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);
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 ("Total messages:", "Total messages:", prop_data->total));
@ -159,19 +172,6 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
row++;
/* 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));
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);
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++;
/* setup the ui with the values retrieved */
l = prop_data->properties;
i = 0;

9
mail/mail-component.c
View File

@ -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);
}