Hello community,

here is the log from the commit of package claws-mail for openSUSE:Factory 
checked in at 2019-12-14 12:22:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/claws-mail (Old)
 and      /work/SRC/openSUSE:Factory/.claws-mail.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "claws-mail"

Sat Dec 14 12:22:41 2019 rev:89 rq:756991 version:3.17.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/claws-mail/claws-mail.changes    2019-10-28 
17:00:18.733753960 +0100
+++ /work/SRC/openSUSE:Factory/.claws-mail.new.4691/claws-mail.changes  
2019-12-14 12:24:15.031191433 +0100
@@ -1,0 +2,13 @@
+Sat Nov 23 07:41:51 UTC 2019 - Jean Delvare <jdelv...@suse.com>
+
+- Add a test on build-time libetpan version to require the proper
+  version at run-time (boo#1157594)
+
+-------------------------------------------------------------------
+Fri Nov 22 09:13:54 UTC 2019 - Jean Delvare <jdelv...@suse.com>
+
+- Move "Mark all read/unread" menu entries where they belong.
+  remove-MarkAll-from-message-menu.patch (claws#4278)
+  add-MarkAll-to-folder-menu.patch (claws#4278)
+
+-------------------------------------------------------------------

New:
----
  add-MarkAll-to-folder-menu.patch
  remove-MarkAll-from-message-menu.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ claws-mail.spec ++++++
--- /var/tmp/diff_new_pack.D1sBos/_old  2019-12-14 12:24:15.679191335 +0100
+++ /var/tmp/diff_new_pack.D1sBos/_new  2019-12-14 12:24:15.683191334 +0100
@@ -42,6 +42,8 @@
 Group:          Productivity/Networking/Email/Clients
 Source:         
http://www.claws-mail.org/download.php?file=releases/%{name}-%{version}.tar.xz
 Patch:          libcanberra-gtk3.patch
+Patch1:         remove-MarkAll-from-message-menu.patch
+Patch2:         add-MarkAll-to-folder-menu.patch
 BuildRequires:  compface-devel
 BuildRequires:  db-devel
 BuildRequires:  docbook-utils
@@ -100,6 +102,11 @@
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       pinentry-gtk2
+# libetpan 1.9.2 introduced function mailstream_ssl_set_server_name, which
+# will be used by claws-mail if available
+%if %{pkg_vcmp libetpan-devel >= 1.9.2}
+Requires:       libetpan >= 1.9.2
+%endif
 %{?libperl_requires}
 Recommends:     %{name}-lang
 Provides:       sylpheed-claws = %{version}
@@ -150,6 +157,8 @@
 %if ! 0%{?favor_gtk2}
 %patch -p1
 %endif
+%patch1 -p1
+%patch2 -p1
 sed -i 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/python/' tools/*.py
 sed -i 's/#!\/usr\/bin\/env bash/#!\/bin\/bash/' tools/*.sh
 sed -i 's/#!\/usr\/bin\/env bash/#!\/bin\/bash/' 
tools/kdeservicemenu/install.sh

++++++ add-MarkAll-to-folder-menu.patch ++++++
From: Jean Delvare <jdelv...@suse.de>
Subject: Add a Folder menu entry with Mark all read/unread

Add a Folder top menu entry so that Mark all read/unread can be done
without opening a context menu with a right mouse click.
---
 src/mainwindow.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- claws.orig/src/mainwindow.c 2019-11-21 11:28:51.799520572 +0100
+++ claws/src/mainwindow.c      2019-11-21 12:00:03.250340886 +0100
@@ -523,6 +523,7 @@ static GtkActionEntry mainwin_entries[]
        {"Edit",                        NULL, N_("_Edit"), NULL, NULL, NULL },
        {"View",                        NULL, N_("_View"), NULL, NULL, NULL },
        {"Message",                     NULL, N_("_Message"), NULL, NULL, NULL 
},
+       {"Folder",                      NULL, N_("Folder"), NULL, NULL, NULL },
        {"Tools",                       NULL, N_("_Tools"), NULL, NULL, NULL },
        {"Configuration",               NULL, N_("_Configuration"), NULL, NULL, 
NULL },
        {"Help",                        NULL, N_("_Help"), NULL, NULL, NULL },
@@ -735,6 +736,10 @@ static GtkActionEntry mainwin_entries[]
 
        {"Message/CheckSignature",                   NULL, N_("Check 
signature"), "C", NULL, G_CALLBACK(check_signature_cb) },
 
+/* Folder menu */
+       {"Folder/MarkAllRead",                       NULL, N_("Mark all read"), 
NULL, NULL, G_CALLBACK(mark_all_read_cb) },
+       {"Folder/MarkAllUnread",                     NULL, N_("Mark all 
unread"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
+
 /* Tools menu */
 
        {"Tools/AddressBook",                        NULL, N_("_Address book"), 
"<control><shift>A", NULL, G_CALLBACK(addressbook_open_cb) }, 
@@ -1511,6 +1516,7 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", 
GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "View", "View", 
GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Message", 
"Message", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Folder", 
"Folder", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Tools", "Tools", 
GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Configuration", 
"Configuration", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Help", "Help", 
GTK_UI_MANAGER_MENU)
@@ -1798,6 +1804,10 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", 
"Separator6", "Message/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", 
"CheckSignature", "Message/CheckSignature", GTK_UI_MANAGER_MENUITEM)
 
+/* Folder menu */
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Folder", 
"MarkAllRead", "Folder/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Folder", 
"MarkAllUnread", "Folder/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
+
 /* Tools menu */
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", 
"AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", 
"AddSenderToAB", "Tools/AddSenderToAB", GTK_UI_MANAGER_MENUITEM)
++++++ remove-MarkAll-from-message-menu.patch ++++++
From: Jean Delvare <jdelv...@suse.de>
Subject: Remove "Mark all read/unread" from the message context menu

"Mark all read/unread" is a folder-related action, it does not belong
to the message context menu. Having it there can easily cause
confusion and trick the users into doing something they really don't
want to do.

This fixes bug #4278:
https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4278
---
 src/mainwindow.c  |   10 ++--------
 src/summaryview.c |   13 ++++---------
 2 files changed, 6 insertions(+), 17 deletions(-)

--- claws-mail-3.17.4.orig/src/mainwindow.c     2019-01-21 11:19:41.000000000 
+0100
+++ claws-mail-3.17.4/src/mainwindow.c  2019-11-22 15:30:47.538966063 +0100
@@ -713,9 +713,6 @@ 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) },
-       /* 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) },
        {"Message/Mark/WatchThread",                 NULL, N_("Watch thread"), 
NULL, NULL, G_CALLBACK(watch_thread_cb) },
@@ -1783,17 +1780,14 @@ MainWindow *main_window_create()
        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", 
"Separator3", "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", 
"Separator4", "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)
--- claws-mail-3.17.4.orig/src/summaryview.c    2019-06-06 14:36:36.000000000 
+0200
+++ claws-mail-3.17.4/src/summaryview.c 2019-11-22 15:31:00.969166496 +0100
@@ -761,17 +761,14 @@ SummaryView *summary_create(MainWindow *
        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)
 
@@ -1827,9 +1824,9 @@ void summary_set_menu_sensitive(SummaryV
        gint i;
 
 #ifndef GENERIC_UMPC
-#define N_ENTRIES 39
+#define N_ENTRIES 37
 #else
-#define N_ENTRIES 28
+#define N_ENTRIES 26
 #endif
        static struct {
                const gchar *entry;
@@ -1868,8 +1865,6 @@ do { \
        FILL_TABLE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
-       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST);
-       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllUnread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/UnignoreThread", 
M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST);

Reply via email to