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 0e20a80e7e162670490e83d5441d64ac40fe9332..cac5501240b07e5edce27af82460f9f99dbd05bb 100644 (file)
--- 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
 2003-12-19 [christoph] 0.9.8claws3
 
        * src/msgcache.c

diff --git a/configure.ac b/configure.ac
index db0e781b02ce9b2b23cea3482a181cc9e7620582..0fa2450b0119ff01292047ddc59b17bbcd6ff74c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 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 ecd305d2454d02f97293d7334bf6d13c7f5835b1..51067ead75253cc697b58420df2001a34ff1c694 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4956,25 +4956,25 @@ CMP_FUNC_DEF(summary_cmp_by_to, to);
 
 #undef CMP_FUNC_DEF
 
 
 #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;
        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);
                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;
        (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;
        
        if (!prefs)
                return -1;
        

-       return strcasecmp(str1, str2);
+       return subject_compare_for_sort(str1, str2);

 }
 
 static gint summary_cmp_by_score(GtkCList *clist,
 }
 
 static gint summary_cmp_by_score(GtkCList *clist,