save and correctly display lock sort mode and type

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 00eef4fe4857aea6285231b35f2635758737c155..31268f3d9457790cfcb1dc7abc152e173bd565bf 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-11-24 [alfons]    0.6.5claws32
+
+       * src/summaryview.[ch]
+               make summary sort headers work, and also make
+               sure the sort type is stored
+
 2001-11-23 [alfons]    0.6.5claws31
 
        * src/summaryview.[ch]

diff --git a/configure.in b/configure.in
index 7cdbbaebf6e752bb569ecce76eec74cf0ef9625d..c75cdd7732a858d4da45eaaebf7cf61d1de62b4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws31
+EXTRA_VERSION=claws32
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/summaryview.c b/src/summaryview.c
index 8dbdeecd4f0f7a77c2d08ed05d6b0be9005828a0..008cadbb8b2bfe28834cbb142d639b6e2fad52e8 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -327,6 +327,8 @@ static void summary_subject_clicked (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_score_clicked      (GtkWidget              *button,
                                         SummaryView            *summaryview);
+static void summary_locked_clicked     (GtkWidget              *button,
+                                        SummaryView            *summaryview);
 
 static void summary_start_drag         (GtkWidget        *widget, 
                                         int button,
@@ -368,6 +370,8 @@ static gint summary_cmp_by_subject  (GtkCList               *clist,
 static gint summary_cmp_by_score       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_locked      (GtkCList *clist,
+                                        gconstpointer ptr1, gconstpointer ptr2);
 static gint summary_cmp_by_label       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
@@ -1831,6 +1835,9 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        case SORT_BY_SCORE:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
                break;
+       case SORT_BY_LOCKED:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+               break;
        case SORT_BY_LABEL:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
                break;
@@ -3904,6 +3911,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM   , summary_from_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE,   summary_score_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED,  summary_locked_clicked);
 
 #undef CLIST_BUTTON_SIGNAL_CONNECT
 
@@ -4406,6 +4414,12 @@ static void summary_score_clicked(GtkWidget *button,
        summary_sort(summaryview, SORT_BY_SCORE);
 }
 
+static void summary_locked_clicked(GtkWidget *button,
+                                 SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_LOCKED);
+}
+
 static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
 {
        summary_sort(summaryview, SORT_BY_SIZE);
@@ -4603,6 +4617,15 @@ static gint summary_cmp_by_score(GtkCList *clist,
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
+static gint summary_cmp_by_locked(GtkCList *clist,
+                                 gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
+}
+
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;

diff --git a/src/summaryview.h b/src/summaryview.h
index b631493577ef398b08c44c7225455dd1ff9ab95a..cdf586269d38e87404b9b074879faad9c056f166 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -63,6 +63,7 @@ typedef enum
        SORT_BY_FROM,
        SORT_BY_SUBJECT,
        SORT_BY_SCORE,
+       SORT_BY_LOCKED,
        SORT_BY_LABEL,
        SORT_BY_MARK,
        SORT_BY_UNREAD,