0.9.10claws50

* src/folderutils.[ch]
        add folderutils_mark_all_read()

* src/folderview.c
        readd "mark all read" from popup menu, now works
        in all folders and not only the opened folder

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b4e01c250b9c05b870bb9cd5161bfe49869a4ff0..b40d153ac5d356dd513684b50ef47ead4155eb2d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2004-04-22 [christoph] 0.9.10claws50
+
+       * src/folderutils.[ch]
+               add folderutils_mark_all_read()
+
+       * src/folderview.c
+               readd "mark all read" from popup menu, now works
+               in all folders and not only the opened folder
+
 2004-04-21 [christoph] 0.9.10claws49
 
        * src/Makefile.am

diff --git a/configure.ac b/configure.ac
index 2de64ab240e266d0557ad5878b804e7feeb62045..dcc4ea06a30f76a96c412df047d385d4b6b55985 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws

diff --git a/src/folderutils.c b/src/folderutils.c
index abc654952c9681388237e2d861c86c425f097740..039637284a4069d6a9787a4c9567a236fa8b2f0b 100644 (file)
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -101,3 +101,26 @@ gint folderutils_delete_duplicates(FolderItem *item,
 
        return dups;    
 }
+
+void folderutils_mark_all_read(FolderItem *item)
+{
+       MsgInfoList *msglist, *cur;
+
+       g_return_if_fail(item != NULL);
+
+       msglist = folder_item_get_msg_list(item);
+       if (msglist == NULL)
+               return;
+
+       folder_item_update_freeze();
+       for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+               MsgInfo *msginfo = cur->data;
+
+               if (msginfo->flags.perm_flags & (MSG_NEW | MSG_UNREAD))
+                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+               procmsg_msginfo_free(msginfo);
+       }
+       folder_item_update_thaw();
+
+       g_slist_free(msglist);
+}

diff --git a/src/folderutils.h b/src/folderutils.h
index 82235e681a02046f664d5f0ff17cfaf3517e9cfc..7fdb1e87c088a76616d878e18e0def7538b5e6cd 100644 (file)
--- a/src/folderutils.h
+++ b/src/folderutils.h
@@ -29,5 +29,6 @@ typedef enum {
 
 gint folderutils_delete_duplicates(FolderItem *item,
                                   DeleteDuplicatesMode mode);
+void folderutils_mark_all_read   (FolderItem *item);
 
 #endif /* FOLDERUTILS_H */

diff --git a/src/folderview.c b/src/folderview.c
index f1a1c1266c1fb349462a2b2b7266d40bb4a8ea76..1eb461d5cccc3f875b908084cf19d89617e61671 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -61,6 +61,7 @@
 #include "inc.h"
 #include "statusbar.h"
 #include "hooks.h"
+#include "folderutils.h"
 
 typedef enum
 {
@@ -553,10 +554,13 @@ void folderview_select(FolderView *folderview, FolderItem *item)
 static void mark_all_read_cb(FolderView *folderview, guint action,
                              GtkWidget *widget)
 {
-/* TODO: claws can do this in all folders not just the opened folder
-       if (folderview->selected)
-               summary_mark_all_read(folderview->summaryview);
-*/
+       FolderItem *item;
+
+       item = folderview_get_selected(folderview);
+       if (item == NULL)
+               return;
+
+       folderutils_mark_all_read(item);
 }
 
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)

diff --git a/src/summaryview.c b/src/summaryview.c
index 01b49fad36d1fa54eab4f32706f1176cec5ed88f..397f797c8c4deac5d426407bb53441cadc07efdf 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2960,8 +2960,8 @@ void summary_mark_all_read(SummaryView *summaryview)
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
-       gtk_clist_thaw(clist);
        folder_item_update_thaw();
+       gtk_clist_thaw(clist);
 
        summary_status_show(summaryview);
 }