From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 19 Dec 2003 19:50:26 +0000 (+0000)
Subject: 0.9.8claws4
X-Git-Tag: rel_0_9_9~83
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8b6a3531bdf81fce01b65aac80b538998d1359b1

0.9.8claws4

* src/summaryview.c
        o code cleanup
        o use subject_compare_for_sort() when comparing
          simplified subjects
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0e20a80e7..cac550124 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-12-19 [christoph]	0.9.8claws4
+
+	* src/summaryview.c
+		o code cleanup
+		o use subject_compare_for_sort() when comparing
+		  simplified subjects
+
 2003-12-19 [christoph]	0.9.8claws3
 
 	* src/msgcache.c
diff --git a/configure.ac b/configure.ac
index db0e781b0..0fa2450b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/summaryview.c b/src/summaryview.c
index ecd305d24..51067ead7 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4956,25 +4956,25 @@ CMP_FUNC_DEF(summary_cmp_by_to, to);
 
 #undef CMP_FUNC_DEF
 
-static gint summary_cmp_by_subject(GtkCList *clist,			 \
-				   gconstpointer ptr1,			 \
-				   gconstpointer ptr2)			 \
-{									 \
-	MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;		 \
-	MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;		 \
-									 \
-	if (!msginfo1->subject)						 \
-		return (msginfo2->subject != NULL);			 \
-	if (!msginfo2->subject)						 \
-		return -1;						 \
-									 \
-	return subject_compare_for_sort					 \
-		(msginfo1->subject, msginfo2->subject);			 \
+static gint summary_cmp_by_subject(GtkCList *clist,
+				   gconstpointer ptr1,
+				   gconstpointer ptr2)
+{
+	MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+	MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+	if (!msginfo1->subject)
+		return (msginfo2->subject != NULL);
+	if (!msginfo2->subject)
+		return -1;
+
+	return subject_compare_for_sort
+		(msginfo1->subject, msginfo2->subject);
 }
 
- static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
- 				 gconstpointer ptr2)
- {
+static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
+				gconstpointer ptr2)
+{
 	const gchar *str1, *str2;
 	const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
 	const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
@@ -4992,9 +4992,9 @@ static gint summary_cmp_by_subject(GtkCList *clist,			 \
  		return -1;
  
 	return strcasecmp(str1, str2);
- }
+}
  
- static gint summary_cmp_by_simplified_subject
+static gint summary_cmp_by_simplified_subject
 	(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
 	const FolderItemPrefs *prefs;
@@ -5023,7 +5023,7 @@ static gint summary_cmp_by_subject(GtkCList *clist,			 \
 	if (!prefs)
 		return -1;
 	
-	return strcasecmp(str1, str2);
+	return subject_compare_for_sort(str1, str2);
 }
 
 static gint summary_cmp_by_score(GtkCList *clist,