From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 12 Mar 2003 08:52:03 +0000 (+0000)
Subject: a sync from 0.8.11cvs4
X-Git-Tag: rel_0_8_11~2
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=75ed2366717123dce7dfe07a826d188d2d0e096f

a sync from 0.8.11cvs4
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index beaa2f2ec..8a20304c7 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-03-12 [paul]	0.8.10claws110
+
+	a sync from 0.8.11cvs4 before the release
+
+	* src/common/utils.c
+		subject_compare_for_sort(): allow null strings (fixes
+	  	summary sorting).
+
 2003-03-11 [paul]	0.8.10claws109
 
 	* po/es.po
diff --git a/configure.ac b/configure.ac
index 3527147b9..acf0dc90b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws109
+EXTRA_VERSION=claws110
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/common/utils.c b/src/common/utils.c
index ce69f9b28..a0c3180e4 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -519,7 +519,6 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
 	gchar *str1, *str2;
 
 	if (!s1 || !s2) return -1;
-	if (!*s1 || !*s2) return -1;
 
 	Xstrdup_a(str1, s1, return -1);
 	Xstrdup_a(str2, s2, return -1);
@@ -527,8 +526,6 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
 	trim_subject_for_sort(str1);
 	trim_subject_for_sort(str2);
 
-	if (!*str1 || !*str2) return -1;
-
 	return strcasecmp(str1, str2);
 }