[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-902-ga19a0c5bb
paul at claws-mail.org
paul at claws-mail.org
Sat Jan 11 07:56:20 CET 2020
The branch, gtk3 has been updated
via a19a0c5bbf6be9308f3e15aac20b9eea28b4f700 (commit)
via e945411dc94a6cc844245ccaa03bd6405daf71fc (commit)
via 46a90a5da948ad0dd75a28c5a9fa4d6da8baad2b (commit)
from 6c3e74a10b649f1354c003288d60716d05e7d2a9 (commit)
Summary of changes:
AUTHORS | 1 +
src/gtk/authors.h | 1 +
src/mainwindow.c | 4 ++--
src/summaryview.c | 9 ++-------
4 files changed, 6 insertions(+), 9 deletions(-)
- Log -----------------------------------------------------------------
commit a19a0c5bbf6be9308f3e15aac20b9eea28b4f700
Author: wwp <subscript at free.fr>
Date: Fri Jan 10 23:52:29 2020 +0100
Fix list format (the <tab> of discord).
diff --git a/AUTHORS b/AUTHORS
index 094883c2a..b01493eb6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -329,5 +329,5 @@ contributors (in addition to the above; based on Changelog)
Florian Weimer
Alexander Lyons Harkness
Jakub Kiciński
- Jean Delvare
+ Jean Delvare
commit e945411dc94a6cc844245ccaa03bd6405daf71fc
Author: wwp <subscript at free.fr>
Date: Fri Jan 10 23:51:23 2020 +0100
Updated contributors list.
diff --git a/AUTHORS b/AUTHORS
index f132ad487..094883c2a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -329,4 +329,5 @@ contributors (in addition to the above; based on Changelog)
Florian Weimer
Alexander Lyons Harkness
Jakub Kiciński
+ Jean Delvare
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 2ba1f57f8..6034aeccf 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -125,6 +125,7 @@ static char *CONTRIBS_LIST[] = {
"Kevin Day",
"Matthieu Dazy",
"Ben Deering",
+"Jean Delvare",
"Pierric Descamps",
"Rodrigo Dias Arruda Senra",
"Frank Dietrich",
commit 46a90a5da948ad0dd75a28c5a9fa4d6da8baad2b
Author: wwp <subscript at free.fr>
Date: Fri Jan 10 23:45:09 2020 +0100
Remove mark all read/unread (in current folder) entries in message
list's context menu. Disambiguate corresponding entries in main window's
message list menu so that it's clear those actions are performed to the
whole content of current folder.
Patch elements kindly suggested by Jean Delvare <jdelvare at suse.de>.
Closes bug #4278.
diff --git a/src/mainwindow.c b/src/mainwindow.c
index ce9aca114..5d8e4a05d 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -713,8 +713,8 @@ static GtkActionEntry mainwin_entries[] =
{"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/Mark/MarkAllRead", NULL, N_("Mark all read"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
- {"Message/Mark/MarkAllUnread", NULL, N_("Mark all unread"), 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/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) },
diff --git a/src/summaryview.c b/src/summaryview.c
index 41a88f7c8..1ace2a848 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -756,17 +756,14 @@ SummaryView *summary_create(MainWindow *mainwin)
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", "Separator3", "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", "Separator4", "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)
@@ -1851,8 +1848,6 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
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);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list