fixed wrong spelling in menu

fixed new/unread message count with ignored threads

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b148709a957c114782264efd84f9e50ea991663e..05d9a28ffbf1b4130ddc1ce4d5375ca00c6fea75 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -5,6 +5,13 @@
                (not working for user entered filename, but
                 for default name and selected filename from
                 file list)
+       * src/mainwindow.c
+               fixed wrong spelling "Folllow-up"
+       * src/mbox_folder.c
+       * src/procmsg.c
+       * src/summaryview.c
+               fixed new/unread message count with ignored
+               threads
 
 2001-08-24 [paul]
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 45eae9dff57fec22ecd3f3e7b33b80f992ce1ce5..a2dc3ac6c4aa5f42097be163813c1feb30552aaf 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1270,7 +1270,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Get from all accounts", M_UNLOCKED},
                {"/Message/Reply"                , M_SINGLE_TARGET_EXIST},
                {"/Message/Reply to sender"      , M_SINGLE_TARGET_EXIST},
-                {"/Message/Folllow-up and reply to", M_SINGLE_TARGET_EXIST},
+                {"/Message/Follow-up and reply to", M_SINGLE_TARGET_EXIST},
                {"/Message/Reply to all"         , M_SINGLE_TARGET_EXIST},
                {"/Message/Forward"              , M_SINGLE_TARGET_EXIST},
                {"/Message/Forward as attachment", M_SINGLE_TARGET_EXIST},

diff --git a/src/mbox_folder.c b/src/mbox_folder.c
index 8c5f7ece91cf393e2fb5f4a768a895284fd7a4f3..e1253832e2529145ff1027ea9dcb16a49f4129db 100644 (file)
--- a/src/mbox_folder.c
+++ b/src/mbox_folder.c
@@ -1717,9 +1717,9 @@ void mbox_scan_folder(Folder *folder, FolderItem *item)
                        struct _message * msg = (struct _message *) l->data;
                        if (!MSG_IS_REALLY_DELETED(msg->flags))
                                total ++;
-                       if (MSG_IS_NEW(msg->flags) /*&& !MSG_IS_IGNORE_THREAD(msg->flags)*/)
+                       if (MSG_IS_NEW(msg->flags) && !MSG_IS_IGNORE_THREAD(msg->flags))
                                new ++;
-                       if (MSG_IS_UNREAD(msg->flags) /*&& !MSG_IS_IGNORE_THREAD(msg->flags)*/)
+                       if (MSG_IS_UNREAD(msg->flags) && !MSG_IS_IGNORE_THREAD(msg->flags))
                                unread ++;
                }
                

diff --git a/src/procmsg.c b/src/procmsg.c
index 394722ea17e9f7559a615fd9132d138cbd59edf5..a22c92e9e54984f3d281ac56953e2dfd9f31a63c 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -401,10 +401,8 @@ static void mark_sum_func(gpointer key, gpointer value, gpointer data)
        MsgFlags *flags = value;
        struct MarkSum *marksum = data;
 
-       /*if (MSG_IS_NEW(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->new)++;*/
-        if (MSG_IS_NEW(*flags)) (*marksum->new)++;
-       /*if (MSG_IS_UNREAD(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->unread)++;*/
-       if (MSG_IS_UNREAD(*flags)) (*marksum->unread)++;
+       if (MSG_IS_NEW(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->new)++;
+       if (MSG_IS_UNREAD(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->unread)++;
        (*marksum->total)++;
 }
 

diff --git a/src/summaryview.c b/src/summaryview.c
index c3c22cb49c655154ceb7fa7249452bd068edeb8c..df7bf4aa0f200b847d61f4a6903ff31115256c8a 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1910,8 +1910,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        }
                        if(parent) {
                                parentinfo = gtk_ctree_node_get_row_data(ctree, parent);
-                               if(parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
-
+                               if(!MSG_IS_IGNORE_THREAD(msginfo->flags) && parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
                                        if (MSG_IS_NEW(msginfo->flags))
                                                summaryview->newmsgs--;
                                        if (MSG_IS_UNREAD(msginfo->flags))
@@ -4137,7 +4136,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
        MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
 
        CHANGE_FLAGS(msginfo);
-               
+
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked as ignore thread\n"),
            msginfo->msgnum);