[Commits] [SCM] claws branch, master, updated. 4.2.0-11-gc4026e988
paul at claws-mail.org
paul at claws-mail.org
Tue Dec 19 16:29:37 UTC 2023
The branch, master has been updated
via c4026e9885536dc3a1137b8fdc848e08d24687f0 (commit)
from 07245a4ad3a7431561c939c35b77df60cd2746de (commit)
Summary of changes:
src/summaryview.c | 70 +++++++++++++++++++++++++++----------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
- Log -----------------------------------------------------------------
commit c4026e9885536dc3a1137b8fdc848e08d24687f0
Author: Paul <paul at claws-mail.org>
Date: Tue Dec 19 17:29:13 2023 +0100
fix paste errors introduced in last commit
diff --git a/src/summaryview.c b/src/summaryview.c
index 3b0a1b7f7..6abdc8d92 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -117,7 +117,7 @@ static GdkPixbuf *clipgpgsignedxpm;
static void summary_free_msginfo_func (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gpointer data);
-static void summary_set_Mark_func (GtkCMCTree *ctree,
+static void summary_set_marks_func (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gpointer data);
@@ -171,7 +171,7 @@ static void summary_display_msg_full (SummaryView *summaryview,
GtkCMCTreeNode *row,
gboolean new_window,
gboolean all_headers);
-static void summary_set_row_Mark (SummaryView *summaryview,
+static void summary_set_row_marks (SummaryView *summaryview,
GtkCMCTreeNode *row);
static gboolean summary_set_row_tag (SummaryView *summaryview,
@@ -2591,7 +2591,7 @@ static void summary_free_msginfo_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
procmsg_msginfo_free(&msginfo);
}
-static void summary_set_Mark_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
+static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
gpointer data)
{
SummaryView *summaryview = data;
@@ -2606,7 +2606,7 @@ static void summary_set_Mark_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
summaryview->total_size += msginfo->size;
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
static void summary_update_status(SummaryView *summaryview)
@@ -3233,7 +3233,7 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
#undef SET_TEXT
GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
- summary_set_Mark_func(ctree, cnode, summaryview);
+ summary_set_marks_func(ctree, cnode, summaryview);
if (msgid && msgid[0] != '\0')
g_hash_table_insert(msgid_table, (gchar *)msgid, cnode);
@@ -3319,7 +3319,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
- summary_set_Mark_func(ctree, node, summaryview);
+ summary_set_marks_func(ctree, node, summaryview);
if (msginfo->msgid && msginfo->msgid[0] != '\0')
g_hash_table_insert(msgid_table,
@@ -3367,7 +3367,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
while (node) {
GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
if (GTK_CMCTREE_ROW(node)->children)
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
node = next;
}
END_TIMING();
@@ -3702,7 +3702,7 @@ static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
summary_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
summary_status_show(summaryview);
}
}
@@ -3942,7 +3942,7 @@ static gboolean summary_have_unread_children(SummaryView *summaryview,
return FALSE;
}
-static void summary_set_row_Mark(SummaryView *summaryview, GtkCMCTreeNode *row)
+static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkStyle *style = NULL;
@@ -4087,7 +4087,7 @@ static void summary_mark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED,
MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
}
@@ -4110,7 +4110,7 @@ static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED,
MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
}
@@ -4125,7 +4125,7 @@ static void summary_unlock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
return;
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is unlocked\n", msginfo->msgnum);
}
@@ -4160,7 +4160,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
return;
summary_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as read\n",
msginfo->msgnum);
}
@@ -4178,7 +4178,7 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
return;
summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
}
@@ -4309,7 +4309,7 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node)) {
if (!GTK_CMCTREE_ROW(node)->expanded)
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
END_LONG_OPERATION(summaryview);
@@ -4355,7 +4355,7 @@ void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node)) {
if (!GTK_CMCTREE_ROW(node)->expanded)
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
END_LONG_OPERATION(summaryview);
@@ -4404,7 +4404,7 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
}
summaryview->display_msg = prefs_common.always_show_msg;
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
}
} else {
log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
@@ -4502,7 +4502,7 @@ static void summary_delete_row(SummaryView *summaryview, GtkCMCTreeNode *row)
if (!prefs_common.immediate_exec &&
!folder_has_parent_of_type(summaryview->folder_item, F_TRASH)) {
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
}
debug_print("Message %s/%d is set to delete\n",
msginfo->folder->path, msginfo->msgnum);
@@ -4653,7 +4653,7 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED,
MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is unmarked\n",
msginfo->folder->path, msginfo->msgnum);
@@ -4705,7 +4705,7 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
}
if (!prefs_common.immediate_exec) {
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
}
debug_print("Message %d is set to move to %s\n",
@@ -4812,7 +4812,7 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE);
}
if (!prefs_common.immediate_exec) {
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
}
debug_print("Message %d is set to copy to %s\n",
@@ -5413,7 +5413,7 @@ static void summary_execute_copy_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
g_slist_prepend(summaryview->mlist, msginfo);
summary_msginfo_unset_flags(msginfo, 0, MSG_COPY);
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
}
@@ -5708,7 +5708,7 @@ void summary_expand_threads(SummaryView *summaryview)
while (node) {
if (GTK_CMCTREE_ROW(node)->children) {
gtk_cmctree_expand(ctree, node);
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
node = GTK_CMCTREE_NODE_NEXT(node);
}
@@ -5747,7 +5747,7 @@ void summary_collapse_threads(SummaryView *summaryview)
while (node) {
if (GTK_CMCTREE_ROW(node)->children) {
gtk_cmctree_collapse(ctree, node);
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
node = GTK_CMCTREE_ROW(node)->sibling;
}
@@ -6046,7 +6046,7 @@ static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCMCTreeNode
summary_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0,
MSG_CLABEL_FLAG_MASK, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
}
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
@@ -6129,7 +6129,7 @@ static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCMCTreeNode *ro
g_free(tags_str);
}
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
if (row == summaryview->displayed) {
return TRUE;
}
@@ -7195,12 +7195,12 @@ void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
static void summary_tree_expanded(GtkCMCTree *ctree, GtkCMCTreeNode *node,
SummaryView *summaryview)
{
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
if (prefs_common.bold_unread) {
while (node) {
GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
if (GTK_CMCTREE_ROW(node)->children)
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
node = next;
}
}
@@ -7210,7 +7210,7 @@ static void summary_tree_collapsed(GtkCMCTree *ctree, GtkCMCTreeNode *node,
SummaryView *summaryview)
{
gtk_sctree_select(GTK_SCTREE(ctree), node);
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
static void summary_unselected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
@@ -7424,7 +7424,7 @@ static void summary_sort_by_column_click(SummaryView *summaryview,
while (node) {
GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
if (GTK_CMCTREE_ROW(node)->children)
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
node = next;
}
}
@@ -7957,7 +7957,7 @@ static void summary_ignore_thread_func_set_row(GtkCMCTree *ctree, GtkCMCTreeNode
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
cm_return_if_fail(msginfo);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d update in row view\n", msginfo->msgnum);
}
@@ -7993,7 +7993,7 @@ static void summary_unignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as unignore thread\n",
msginfo->msgnum);
}
@@ -8055,7 +8055,7 @@ static void summary_watch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gp
summary_msginfo_change_flags(msginfo, MSG_WATCH_THREAD, 0, MSG_IGNORE_THREAD, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as watch thread\n",
msginfo->msgnum);
}
@@ -8087,7 +8087,7 @@ static void summary_unwatch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
- summary_set_row_Mark(summaryview, row);
+ summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as unwatch thread\n",
msginfo->msgnum);
}
@@ -8374,7 +8374,7 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
msginfo_update->msginfo);
if (node)
- summary_set_row_Mark(summaryview, node);
+ summary_set_row_marks(summaryview, node);
}
return FALSE;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list