[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-8-g029e2af19
paul at claws-mail.org
paul at claws-mail.org
Tue Dec 19 16:23:58 UTC 2023
The branch, gtk2 has been updated
via 029e2af192546b4e361b1d1229ddb406a36a8a24 (commit)
from e6b31c8852b33a18f25c98c562c001c850d8ae2d (commit)
Summary of changes:
po/Makevars | 3 +-
src/mainwindow.c | 97 ++++++++++++++++----------------
src/summaryview.c | 164 ++++++++++++++++++++++++++++--------------------------
3 files changed, 136 insertions(+), 128 deletions(-)
- Log -----------------------------------------------------------------
commit 029e2af192546b4e361b1d1229ddb406a36a8a24
Author: Paul <paul at claws-mail.org>
Date: Tue Dec 19 17:20:34 2023 +0100
revert menu label changes, give translators context instead
this avoids breaking custom user shortcuts on these menu items
diff --git a/po/Makevars b/po/Makevars
index c3788c3e6..1fa6df232 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -12,7 +12,8 @@ XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=Q_ --flag=Q_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
- --keyword=C_:1c,2 \
+ --keyword=NC_:1c,2 \
+ --keyword=C_:1c,2 \
--keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \
--keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
diff --git a/src/mainwindow.c b/src/mainwindow.c
index afc732d0a..e0024dbe0 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -703,32 +703,31 @@ static GtkActionEntry mainwin_entries[] =
{"Message/DeleteThread", NULL, N_("Delete t_hread"), NULL, NULL, G_CALLBACK(delete_thread_cb) },
{"Message/CancelNews", NULL, N_("Cancel a news message"), NULL, NULL, G_CALLBACK(cancel_cb) },
/* separation */
-
- {"Message/Marks", NULL, N_("_Marks"), NULL, NULL, NULL },
- {"Message/Marks/Mark", NULL, N_("_Mark"), "<shift>asterisk", NULL, G_CALLBACK(mark_cb) },
- {"Message/Marks/Unmark", NULL, N_("_Unmark"), "U", NULL, G_CALLBACK(unmark_cb) },
- {"Message/Marks/---", NULL, "---", NULL, NULL, NULL },
+ {"Message/Mark", NULL, NC_("Menu Item", "_Mark"), NULL, NULL, NULL },
+ {"Message/Mark/Mark", NULL, NC_("Sub-Menu Item", "_Mark"), "<shift>asterisk", NULL, G_CALLBACK(mark_cb) },
+ {"Message/Mark/Unmark", NULL, N_("_Unmark"), "U", NULL, G_CALLBACK(unmark_cb) },
+ {"Message/Mark/---", NULL, "---", NULL, NULL, NULL },
- {"Message/Marks/MarkRead", NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(mark_as_read_cb) },
- {"Message/Marks/MarkUnread", NULL, N_("Mark as unr_ead"), "<shift>exclam", NULL, G_CALLBACK(mark_as_unread_cb) },
+ {"Message/Mark/MarkRead", NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(mark_as_read_cb) },
+ {"Message/Mark/MarkUnread", NULL, N_("Mark as unr_ead"), "<shift>exclam", NULL, G_CALLBACK(mark_as_unread_cb) },
/* separation */
- {"Message/Marks/MarkAllRead", NULL, N_("Mark all read in folder"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
- {"Message/Marks/MarkAllUnread", NULL, N_("Mark all unread in folder"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
+ {"Message/Mark/MarkAllRead", NULL, N_("Mark all read in folder"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
+ {"Message/Mark/MarkAllUnread", NULL, N_("Mark all unread in folder"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
/* separation */
- {"Message/Marks/IgnoreThread", NULL, N_("Ignore thread"), NULL, NULL, G_CALLBACK(ignore_thread_cb) },
- {"Message/Marks/UnignoreThread", NULL, N_("Unignore thread"), NULL, NULL, G_CALLBACK(unignore_thread_cb) },
- {"Message/Marks/WatchThread", NULL, N_("Watch thread"), NULL, NULL, G_CALLBACK(watch_thread_cb) },
- {"Message/Marks/UnwatchThread", NULL, N_("Unwatch thread"), NULL, NULL, G_CALLBACK(unwatch_thread_cb) },
+ {"Message/Mark/IgnoreThread", NULL, N_("Ignore thread"), NULL, NULL, G_CALLBACK(ignore_thread_cb) },
+ {"Message/Mark/UnignoreThread", NULL, N_("Unignore thread"), NULL, NULL, G_CALLBACK(unignore_thread_cb) },
+ {"Message/Mark/WatchThread", NULL, N_("Watch thread"), NULL, NULL, G_CALLBACK(watch_thread_cb) },
+ {"Message/Mark/UnwatchThread", NULL, N_("Unwatch thread"), NULL, NULL, G_CALLBACK(unwatch_thread_cb) },
/* separation */
- {"Message/Marks/MarkSpam", NULL, N_("Mark as _spam"), NULL, NULL, G_CALLBACK(mark_as_spam_cb) },
- {"Message/Marks/MarkHam", NULL, N_("Mark as _ham"), NULL, NULL, G_CALLBACK(mark_as_ham_cb) },
+ {"Message/Mark/MarkSpam", NULL, N_("Mark as _spam"), NULL, NULL, G_CALLBACK(mark_as_spam_cb) },
+ {"Message/Mark/MarkHam", NULL, N_("Mark as _ham"), NULL, NULL, G_CALLBACK(mark_as_ham_cb) },
/* separation */
- {"Message/Marks/Lock", NULL, N_("Lock"), NULL, NULL, G_CALLBACK(lock_msgs_cb) },
- {"Message/Marks/Unlock", NULL, N_("Unlock"), NULL, NULL, G_CALLBACK(unlock_msgs_cb) },
+ {"Message/Mark/Lock", NULL, N_("Lock"), NULL, NULL, G_CALLBACK(lock_msgs_cb) },
+ {"Message/Mark/Unlock", NULL, N_("Unlock"), NULL, NULL, G_CALLBACK(unlock_msgs_cb) },
- {"Message/ColorLabels", NULL, N_("Color la_bels"), NULL, NULL, NULL },
+ {"Message/ColorLabel", NULL, N_("Color la_bel"), NULL, NULL, NULL },
{"Message/Tags", NULL, N_("Ta_gs"), NULL, NULL, NULL },
/*{"Message/---", NULL, "---", NULL, NULL, NULL },*/
@@ -1164,7 +1163,7 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
gint i;
gchar *accel_path = NULL;
- label_menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/ColorLabels");
+ label_menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/ColorLabel");
g_signal_connect(G_OBJECT(label_menuitem), "activate",
G_CALLBACK(mainwindow_colorlabel_menu_item_activate_item_cb),
mainwin);
@@ -1213,6 +1212,8 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
+
+
}
gtk_widget_show(menu);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
@@ -1775,27 +1776,27 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "CancelNews", "Message/CancelNews", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator4", "Message/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Marks", "Message/Marks", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Mark", "Message/Marks/Mark", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Unmark", "Message/Marks/Unmark", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Separator1", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "MarkRead", "Message/Marks/MarkRead", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "MarkUnread", "Message/Marks/MarkUnread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Separator2", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "MarkAllRead", "Message/Marks/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "MarkAllUnread", "Message/Marks/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Separator3", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "IgnoreThread", "Message/Marks/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "UnignoreThread", "Message/Marks/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "WatchThread", "Message/Marks/WatchThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "UnwatchThread", "Message/Marks/UnwatchThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Separator4", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "MarkSpam", "Message/Marks/MarkSpam", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "MarkHam", "Message/Marks/MarkHam", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Separator5", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Lock", "Message/Marks/Lock", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Unlock", "Message/Marks/Unlock", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ColorLabels", "Message/ColorLabels", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Mark", "Message/Mark", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "WatchThread", "Message/Mark/WatchThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnwatchThread", "Message/Mark/UnwatchThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator4", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkSpam", "Message/Mark/MarkSpam", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkHam", "Message/Mark/MarkHam", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator5", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Lock", "Message/Mark/Lock", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Unlock", "Message/Mark/Unlock", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ColorLabel", "Message/ColorLabel", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Tags", "Message/Tags", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator5", "Message/---", GTK_UI_MANAGER_SEPARATOR)
@@ -3218,14 +3219,14 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
SET_SENSITIVE("Menu/Message/TrashThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/DeleteThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/CancelNews", M_TARGET_EXIST, M_ALLOW_DELETE, M_NEWS);
- SET_SENSITIVE("Menu/Message/Marks", M_TARGET_EXIST, M_SUMMARY_ISLIST);
- SET_SENSITIVE("Menu/Message/Marks/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
- SET_SENSITIVE("Menu/Message/Marks/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
- SET_SENSITIVE("Menu/Message/Marks/IgnoreThread", M_TARGET_EXIST);
- SET_SENSITIVE("Menu/Message/Marks/UnignoreThread", M_TARGET_EXIST);
- SET_SENSITIVE("Menu/Message/Marks/Lock", M_TARGET_EXIST);
- SET_SENSITIVE("Menu/Message/Marks/Unlock", M_TARGET_EXIST);
- SET_SENSITIVE("Menu/Message/ColorLabels", M_TARGET_EXIST);
+ SET_SENSITIVE("Menu/Message/Mark", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+ SET_SENSITIVE("Menu/Message/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+ SET_SENSITIVE("Menu/Message/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+ SET_SENSITIVE("Menu/Message/Mark/IgnoreThread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menu/Message/Mark/UnignoreThread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menu/Message/Mark/Lock", M_TARGET_EXIST);
+ SET_SENSITIVE("Menu/Message/Mark/Unlock", M_TARGET_EXIST);
+ SET_SENSITIVE("Menu/Message/ColorLabel", M_TARGET_EXIST);
SET_SENSITIVE("Menu/Message/Tags", M_TARGET_EXIST);
SET_SENSITIVE("Menu/Message/Reedit", M_HAVE_ACCOUNT, M_ALLOW_REEDIT);
SET_SENSITIVE("Menu/Message/CheckSignature", M_SINGLE_TARGET_EXIST);
diff --git a/src/summaryview.c b/src/summaryview.c
index f11545916..1e340a35e 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1,6 +1,6 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -122,7 +122,7 @@ static GdkPixbuf *clipgpgsignedxpm;
static void summary_free_msginfo_func (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gpointer data);
-static void summary_set_marks_func (GtkCMCTree *ctree,
+static void summary_set_Mark_func (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gpointer data);
@@ -176,7 +176,7 @@ static void summary_display_msg_full (SummaryView *summaryview,
GtkCMCTreeNode *row,
gboolean new_window,
gboolean all_headers);
-static void summary_set_row_marks (SummaryView *summaryview,
+static void summary_set_row_Mark (SummaryView *summaryview,
GtkCMCTreeNode *row);
static gboolean summary_set_row_tag (SummaryView *summaryview,
@@ -438,8 +438,8 @@ static GtkActionEntry summary_popup_entries[] =
{"SummaryViewPopup/Forward", NULL, N_("_Forward"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_FORWARD_INLINE */
{"SummaryViewPopup/ForwardAtt", NULL, N_("For_ward as attachment"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_FORWARD_AS_ATTACH */
{"SummaryViewPopup/Redirect", NULL, N_("Redirec_t"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REDIRECT */
- {"SummaryViewPopup/Marks", NULL, N_("_Marks"), NULL, NULL, NULL },
- {"SummaryViewPopup/ColorLabels", NULL, N_("Color la_bels"), NULL, NULL, NULL },
+ {"SummaryViewPopup/Mark", NULL, NC_("Menu Item", "_Mark"), NULL, NULL, NULL },
+ {"SummaryViewPopup/ColorLabel", NULL, N_("Color la_bel"), NULL, NULL, NULL },
{"SummaryViewPopup/Tags", NULL, N_("Ta_gs"), NULL, NULL, NULL },
{"SummaryViewPopup/CreateFilterRule", NULL, N_("Create _filter rule"), NULL, NULL, NULL },
#ifndef GENERIC_UMPC
@@ -732,8 +732,8 @@ SummaryView *summary_create(MainWindow *mainwin)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Delete", "Message/Delete", GTK_UI_MANAGER_MENUITEM)
#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator3", "Message/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Marks", "SummaryViewPopup/Marks", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ColorLabels", "SummaryViewPopup/ColorLabels", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Mark", "SummaryViewPopup/Mark", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ColorLabel", "SummaryViewPopup/ColorLabel", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Tags", "SummaryViewPopup/Tags", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator4", "Message/---", GTK_UI_MANAGER_SEPARATOR)
@@ -759,25 +759,25 @@ SummaryView *summary_create(MainWindow *mainwin)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/ReplyTo", "MailingList", "SummaryViewPopup/ReplyTo/List", GTK_UI_MANAGER_MENUITEM)
/* submenus - mark */
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Mark", "Message/Marks/Mark", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Unmark", "Message/Marks/Unmark", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Separator1", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "MarkRead", "Message/Marks/MarkRead", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "MarkUnread", "Message/Marks/MarkUnread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Separator2", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "MarkAllRead", "Message/Marks/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "MarkAllUnread", "Message/Marks/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Separator3", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "IgnoreThread", "Message/Marks/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "UnignoreThread", "Message/Marks/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "WatchThread", "Message/Marks/WatchThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "UnwatchThread", "Message/Marks/UnwatchThread", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Separator4", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "MarkSpam", "Message/Marks/MarkSpam", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "MarkHam", "Message/Marks/MarkHam", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Separator5", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Lock", "Message/Marks/Lock", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Marks", "Unlock", "Message/Marks/Unlock", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "WatchThread", "Message/Mark/WatchThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnwatchThread", "Message/Mark/UnwatchThread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator4", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkSpam", "Message/Mark/MarkSpam", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkHam", "Message/Mark/MarkHam", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator5", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Lock", "Message/Mark/Lock", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Unlock", "Message/Mark/Unlock", GTK_UI_MANAGER_MENUITEM)
/* submenus - colorlabel and tags are dynamic */
/* submenus - createfilterrule */
@@ -1335,7 +1335,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item, gboolean avoid
summaryview->displayed);
}
- /* process the marks if any */
+ /* process the Mark if any */
if (!is_refresh &&
(summaryview->mainwin->lock_count == 0 &&
(summaryview->moved > 0 || summaryview->copied > 0))) {
@@ -1343,8 +1343,14 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item, gboolean avoid
gboolean changed = FALSE;
val = alertpanel(_("Process mark"),
+<<<<<<< HEAD
_("Some marks are left. Process them?"),
GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL, ALERTFOCUS_FIRST);
+=======
+ _("Some Mark are left. Process them?"),
+ NULL, _("_No"), NULL, _("_Yes"), NULL, _("_Cancel"),
+ ALERTFOCUS_FIRST);
+>>>>>>> 07245a4ad (revert menu label changes, give translators context instead)
if (G_ALERTALTERNATE == val) {
summary_unlock(summaryview);
summary_execute(summaryview);
@@ -1856,22 +1862,22 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
SET_SENSITIVE("Menus/SummaryViewPopup/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
#endif
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/Mark", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/Unmark", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkRead", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkUnread", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkAllRead", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkAllUnread", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/IgnoreThread", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/UnignoreThread", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/WatchThread", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/UnwatchThread", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/Lock", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/Unlock", M_TARGET_EXIST);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
- SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
- SET_SENSITIVE("Menus/SummaryViewPopup/ColorLabels", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/Mark", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/MarkAllUnread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/UnignoreThread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/UnwatchThread", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/Lock", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+ SET_SENSITIVE("Menus/SummaryViewPopup/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+ SET_SENSITIVE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/Tags", M_TARGET_EXIST);
#ifndef GENERIC_UMPC
@@ -2594,7 +2600,7 @@ static void summary_free_msginfo_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
procmsg_msginfo_free(&msginfo);
}
-static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
+static void summary_set_Mark_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
gpointer data)
{
SummaryView *summaryview = data;
@@ -2609,7 +2615,7 @@ static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
summaryview->total_size += msginfo->size;
- summary_set_row_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
static void summary_update_status(SummaryView *summaryview)
@@ -2886,7 +2892,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
label = gtk_image_new_from_pixbuf(markxpm);
gtk_widget_show(label);
gtk_cmclist_set_column_widget(clist, pos, label);
- gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Mark"));
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, C_("Column Header", "_Mark"));
continue;
} else if (type == S_COL_LOCKED) {
label = gtk_image_new_from_pixbuf(lockedxpm);
@@ -3238,7 +3244,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_marks_func(ctree, cnode, summaryview);
+ summary_set_Mark_func(ctree, cnode, summaryview);
if (msgid && msgid[0] != '\0')
g_hash_table_insert(msgid_table, (gchar *)msgid, cnode);
@@ -3320,7 +3326,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_marks_func(ctree, node, summaryview);
+ summary_set_Mark_func(ctree, node, summaryview);
if (msginfo->msgid && msginfo->msgid[0] != '\0')
g_hash_table_insert(msgid_table,
@@ -3368,7 +3374,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_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
node = next;
}
END_TIMING();
@@ -3703,7 +3709,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
summary_status_show(summaryview);
}
}
@@ -3943,7 +3949,7 @@ static gboolean summary_have_unread_children(SummaryView *summaryview,
return FALSE;
}
-static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
+static void summary_set_row_Mark(SummaryView *summaryview, GtkCMCTreeNode *row)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkStyle *style = NULL;
@@ -4102,7 +4108,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
}
@@ -4125,7 +4131,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
}
@@ -4140,7 +4146,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is unlocked\n", msginfo->msgnum);
}
@@ -4175,7 +4181,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
return;
summary_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is marked as read\n",
msginfo->msgnum);
}
@@ -4193,7 +4199,7 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
return;
summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
}
@@ -4324,7 +4330,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_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
END_LONG_OPERATION(summaryview);
@@ -4370,7 +4376,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_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
END_LONG_OPERATION(summaryview);
@@ -4419,7 +4425,7 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
}
summaryview->display_msg = prefs_common.always_show_msg;
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
}
} else {
log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
@@ -4517,7 +4523,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
}
debug_print("Message %s/%d is set to delete\n",
msginfo->folder->path, msginfo->msgnum);
@@ -4668,7 +4674,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %s/%d is unmarked\n",
msginfo->folder->path, msginfo->msgnum);
@@ -4720,7 +4726,7 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
}
if (!prefs_common.immediate_exec) {
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
}
debug_print("Message %d is set to move to %s\n",
@@ -4827,7 +4833,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
}
debug_print("Message %d is set to copy to %s\n",
@@ -5428,7 +5434,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_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
}
@@ -5723,7 +5729,7 @@ void summary_expand_threads(SummaryView *summaryview)
while (node) {
if (GTK_CMCTREE_ROW(node)->children) {
gtk_cmctree_expand(ctree, node);
- summary_set_row_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
node = GTK_CMCTREE_NODE_NEXT(node);
}
@@ -5762,7 +5768,7 @@ void summary_collapse_threads(SummaryView *summaryview)
while (node) {
if (GTK_CMCTREE_ROW(node)->children) {
gtk_cmctree_collapse(ctree, node);
- summary_set_row_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
node = GTK_CMCTREE_ROW(node)->sibling;
}
@@ -6059,7 +6065,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
}
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
@@ -6142,7 +6148,7 @@ static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCMCTreeNode *ro
g_free(tags_str);
}
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
if (row == summaryview->displayed) {
return TRUE;
}
@@ -6267,7 +6273,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
gint i;
gchar *accel_path = NULL;
- label_menuitem = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menus/SummaryViewPopup/ColorLabels");
+ label_menuitem = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menus/SummaryViewPopup/ColorLabel");
g_signal_connect(G_OBJECT(label_menuitem), "activate",
G_CALLBACK(summary_colorlabel_menu_item_activate_item_cb),
summaryview);
@@ -7214,12 +7220,12 @@ void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
static void summary_tree_expanded(GtkCMCTree *ctree, GtkCMCTreeNode *node,
SummaryView *summaryview)
{
- summary_set_row_marks(summaryview, node);
+ summary_set_row_Mark(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_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
node = next;
}
}
@@ -7229,7 +7235,7 @@ static void summary_tree_collapsed(GtkCMCTree *ctree, GtkCMCTreeNode *node,
SummaryView *summaryview)
{
gtk_sctree_select(GTK_SCTREE(ctree), node);
- summary_set_row_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
static void summary_unselected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
@@ -7443,7 +7449,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_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
node = next;
}
}
@@ -7975,7 +7981,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d update in row view\n", msginfo->msgnum);
}
@@ -8011,7 +8017,7 @@ static void summary_unignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is marked as unignore thread\n",
msginfo->msgnum);
}
@@ -8073,7 +8079,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_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is marked as watch thread\n",
msginfo->msgnum);
}
@@ -8105,7 +8111,7 @@ static void summary_unwatch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
- summary_set_row_marks(summaryview, row);
+ summary_set_row_Mark(summaryview, row);
debug_print("Message %d is marked as unwatch thread\n",
msginfo->msgnum);
}
@@ -8392,7 +8398,7 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
msginfo_update->msginfo);
if (node)
- summary_set_row_marks(summaryview, node);
+ summary_set_row_Mark(summaryview, node);
}
return FALSE;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list