talons

commit 841387cf2adee57247b2f28c1c8dd95130375f17
parent 91c2ea816ec1c8e087cadc7bb25278baba4c09d6
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 26 Jun 2009 06:45:11 +0000

2009-06-26 [colin]	3.7.1cvs79

	* src/summaryview.c
		Sort by msgnum if dates are equal

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/summaryview.c
 | 
2
++

4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-26 [colin]	3.7.1cvs79
+
+	* src/summaryview.c
+		Sort by msgnum if dates are equal
+
 2009-06-24 [paul]	3.7.1cvs78
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3818,3 +3818,4 @@
 ( cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/sgpgme.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/mypgpcore.def;  cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/smime/mypgpcore.def;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/smime/smime.c;  ) > 3.7.1cvs76.patchset
 ( cvs diff -u -r 1.395.2.410 -r 1.395.2.411 src/summaryview.c;  ) > 3.7.1cvs77.patchset
 ( cvs diff -u -r 1.395.2.411 -r 1.395.2.412 src/summaryview.c;  ) > 3.7.1cvs78.patchset
+( cvs diff -u -r 1.395.2.412 -r 1.395.2.413 src/summaryview.c;  ) > 3.7.1cvs79.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=78
+EXTRA_VERSION=79
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -7162,6 +7162,8 @@ static gint summary_cmp_by_date(GtkCMCList *clist,
 		return -1;
 
 	res = (msginfo1->date_t - msginfo2->date_t);
+	if (res == 0)
+		res = msginfo1->msgnum - msginfo2->msgnum;
 	return res;
 }