+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
( 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
MICRO_VERSION=99
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
/*
* 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
/*
* 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
/*
* 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
/*
* 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
/*
* 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
/*
* 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
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;
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);
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);
}