2007-03-31 [colin] 2.8.1cvs77
authorColin Leroy <colin@colino.net>
Sat, 31 Mar 2007 14:38:12 +0000 (14:38 +0000)
committerColin Leroy <colin@colino.net>
Sat, 31 Mar 2007 14:38:12 +0000 (14:38 +0000)
* 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
PATCHSETS
configure.ac
src/folderview.c
src/prefs_common.c
src/prefs_common.h

index 2f4d3d4358633c5c08b24a32cf08cc6ac2218039..001049bb93287a09f7ef477e7a046893b2281b73 100644 (file)
--- 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
index 975182145b2df58de7a9d2aacb91fdb5750ed3eb..b551592042d2fdc9edec315a4119668dba4e5cd5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 9f4b62503de7dc2df10af6c2b4f579cbe9aaf216..2adc90d8db1c71528d5cac506df7dd6128f90472 100644 (file)
@@ -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=
 
index e933b548b3473b0ddd99e175c4a57f6f5145d890..5c80a40e0a84d09622d39dd8b9210a738cbaa822 100644 (file)
@@ -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) ||
index f70e489fab148faf94d807f743001537fc766cce..0f3f618975aea69a53dd411ee3d68bbd70debed2 100644 (file)
@@ -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,
index 3e7a7e23e65ce52192f190e22da45d20b9a78550..a78615e48072bf4787983e7476b0031f19bb20f0 100644 (file)
@@ -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;