From c447cec3e7aa3efcfcaa547b82459956672e55f7 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 31 Mar 2007 14:38:12 +0000 Subject: [PATCH] 2007-03-31 [colin] 2.8.1cvs77 * src/folderview.c * src/prefs_common.c * src/prefs_common.h Fix bug 1167, 'Allow not displaying zeros in folder list'. Patch by MartinP --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 6 +++--- src/prefs_common.c | 3 +++ src/prefs_common.h | 1 + 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f4d3d435..001049bb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-03-31 [colin] 2.8.1cvs77 + + * src/folderview.c + * src/prefs_common.c + * src/prefs_common.h + Fix bug 1167, 'Allow not displaying zeros + in folder list'. Patch by MartinP + 2007-03-31 [colin] 2.8.1cvs76 * AUTHORS diff --git a/PATCHSETS b/PATCHSETS index 975182145..b55159204 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2493,3 +2493,4 @@ ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/gtk/authors.h; ) > 2.8.1cvs74.patchset ( cvs diff -u -r 1.179.2.162 -r 1.179.2.163 src/imap.c; ) > 2.8.1cvs75.patchset ( cvs diff -u -r 1.100.2.48 -r 1.100.2.49 AUTHORS; ) > 2.8.1cvs76.patchset +( cvs diff -u -r 1.207.2.158 -r 1.207.2.159 src/folderview.c; cvs diff -u -r 1.204.2.128 -r 1.204.2.129 src/prefs_common.c; cvs diff -u -r 1.103.2.78 -r 1.103.2.79 src/prefs_common.h; ) > 2.8.1cvs77.patchset diff --git a/configure.ac b/configure.ac index 9f4b62503..2adc90d8d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=76 +EXTRA_VERSION=77 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index e933b548b..5c80a40e0 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1621,9 +1621,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node) gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-"); gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], "-"); } else { - gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW], itos(item->new_msgs)); - gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], itos(item->unread_msgs)); - gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], itos(item->total_msgs)); + gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW], item->new_msgs > 0 ? itos(item->new_msgs) : prefs_common.zero_replacement); + gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], item->unread_msgs > 0 ? itos(item->unread_msgs) : prefs_common.zero_replacement); + gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], item->total_msgs > 0 ? itos(item->total_msgs) : prefs_common.zero_replacement); } if (folder_has_parent_of_type(item, F_OUTBOX) || diff --git a/src/prefs_common.c b/src/prefs_common.c index f70e489fa..0f3f61897 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -886,6 +886,9 @@ static PrefParam param[] = { {"folderitemwin_height", "-1", &prefs_common.folderitemwin_height, P_INT, NULL, NULL, NULL}, + {"zero_replacement_char", "0", &prefs_common.zero_replacement, P_STRING, + NULL, NULL, NULL}, + {"editaccountwin_width", "500", &prefs_common.editaccountwin_width, P_INT, NULL, NULL, NULL}, {"editaccountwin_height", "-1", &prefs_common.editaccountwin_height, P_INT, diff --git a/src/prefs_common.h b/src/prefs_common.h index 3e7a7e23e..a78615e48 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -411,6 +411,7 @@ struct _PrefsCommon gint prefswin_height; gint folderitemwin_width; gint folderitemwin_height; + gchar *zero_replacement; gint editaccountwin_width; gint editaccountwin_height; gint accountswin_width; -- 2.25.1