2005-11-02 [cleroy] 1.9.99cvs6

	* src/summaryview.c
		Fix totals when read messages are hidden or quicksearch
		is on
	* src/ssl_manager.c
	* src/ssl_manager.h
	* src/common/ssl_certificate.c
	* src/common/ssl_certificate.h
	* src/gtk/sslcertwindow.c
	* src/gtk/sslcertwindow.h
		Fix copyright on my stuff

diff --git a/ChangeLog b/ChangeLog
index c47a860f1b54532300d3137003a37a0463b1af69..b8e5fa111f89b29bf74218714c2d760b64224b36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-11-02 [cleroy]    1.9.99cvs6
+
+       * src/summaryview.c
+               Fix totals when read messages are hidden or quicksearch
+               is on
+       * src/ssl_manager.c
+       * src/ssl_manager.h
+       * src/common/ssl_certificate.c
+       * src/common/ssl_certificate.h
+       * src/gtk/sslcertwindow.c
+       * src/gtk/sslcertwindow.h
+               Fix copyright on my stuff
+
 2005-11-02 [wwp]       1.9.99cvs5
 
        * src/prefs_themes.c

diff --git a/PATCHSETS b/PATCHSETS
index 4a157f34e27b5248a78f63b15600026979d61b5c..a9e4f6ddd109233be84c1465c37a273a046a084e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -972,3 +972,4 @@
 ( cvs diff -u -r 1.8.2.4 -r 1.8.2.5 po/ko.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/nb.po;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/wizard.c;  ) > 1.9.99cvs3.patchset
 ( cvs diff -u -r 1.395.2.146 -r 1.395.2.147 src/summaryview.c;  ) > 1.9.99cvs4.patchset
 ( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/prefs_themes.c;  ) > 1.9.99cvs5.patchset
+( cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/ssl_manager.c;  cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/ssl_manager.h;  cvs diff -u -r 1.395.2.147 -r 1.395.2.148 src/summaryview.c;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/ssl_certificate.h;  cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/gtk/sslcertwindow.c;  cvs diff -u -r 1.6.2.1 -r 1.6.2.2 src/gtk/sslcertwindow.h;  ) > 1.9.99cvs6.patchset

diff --git a/configure.ac b/configure.ac
index d8d5c29b116c5f605a8fc5d656ae6aac3f454183..f89cb0d91cfd8a246efc7fbf2a3d234e8792c8e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=99
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 57b944d46bbc63ae765fffea439ad2965340be2a..5d4dcefbcf6d0ecaa3d4b6c11dad01bcfb6ee807 100644 (file)
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h
index 328098944b657432df69b729dd8c3ee4d6dd4885..178663eab8bac8336d9695253b8b343b64e985d3 100644 (file)
--- a/src/common/ssl_certificate.h
+++ b/src/common/ssl_certificate.h
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 2060d42ba6f95a10137cc1af86ecea83a33f21ba..28423f0201d5cfd3cbb6761d3ad6713d7329d517 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/gtk/sslcertwindow.h b/src/gtk/sslcertwindow.h
index daeb187b21df86e48c9f1e639fb516da8949a6cf..1b010797838eb45942a9b0141b31bef36038a797 100644 (file)
--- a/src/gtk/sslcertwindow.h
+++ b/src/gtk/sslcertwindow.h
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 3e694225d67e1a0c291723f5d8f7e287d07f28cc..a4861b1e71829ec471d1595231cc2a76056af448 100644 (file)
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/ssl_manager.h b/src/ssl_manager.h
index 24cf063d2d30c604097d37ca0d4c8cf9036f1972..3ffd32b760365a6c0f600b9572c914c2408afcb0 100644 (file)
--- a/src/ssl_manager.h
+++ b/src/ssl_manager.h
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/summaryview.c b/src/summaryview.c
index 081af0a3ad1e44de2a3e5c908ede35a50c34bb7d..624cd4feb83634d16786ef3f0f7c3ab84365ddc5 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1894,8 +1894,8 @@ static void summary_status_show(SummaryView *summaryview)
        gchar *spc;
        gchar *itstr;
        GList *rowlist, *cur;
-       guint n_selected = 0;
-       off_t sel_size = 0;
+       guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
+       off_t sel_size = 0, n_size = 0;
        MsgInfo *msginfo;
        gchar *name;
        
@@ -1916,7 +1916,33 @@ static void summary_status_show(SummaryView *summaryview)
                else {
                        sel_size += msginfo->size;
                        n_selected++;
+                       
+               }
+       }
+       
+       if (summaryview->folder_item->hide_read_msgs 
+       || quicksearch_is_active(summaryview->quicksearch)) {
+               rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+               for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+                       msginfo = gtk_ctree_node_get_row_data
+                               (GTK_CTREE(summaryview->ctree),
+                                GTK_CTREE_NODE(cur));
+                       if (!msginfo)
+                               g_warning("summary_status_show(): msginfo == NULL\n");
+                       else {
+                               n_size += msginfo->size;
+                               n_total++;
+                               if (MSG_IS_NEW(msginfo->flags))
+                                       n_new++;
+                               if (MSG_IS_UNREAD(msginfo->flags))
+                                       n_unread++;
+                       }
                }
+       } else {
+               n_new = summaryview->folder_item->new_msgs;
+               n_unread = summaryview->folder_item->unread_msgs;
+               n_total = summaryview->folder_item->total_msgs;
+               n_size = summaryview->total_size;
        }
 
        name = folder_item_get_name(summaryview->folder_item);
@@ -1969,10 +1995,8 @@ static void summary_status_show(SummaryView *summaryview)
 
        str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
 
-                                     summaryview->folder_item->new_msgs,
-                                     summaryview->folder_item->unread_msgs,
-                                     summaryview->folder_item->total_msgs,
-                                     to_human_readable(summaryview->total_size));
+                                     n_new, n_unread, n_total,
+                                     to_human_readable(n_size));
        gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 }