[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-491-g98e157f
ticho at claws-mail.org
ticho at claws-mail.org
Sat Nov 24 22:30:17 CET 2018
The branch, gtk3 has been updated
via 98e157fb30395f79d7088d7933832490b449c912 (commit)
via 102f33c826cf6b4bad805161f9632012a14ee315 (commit)
via 6936a2c82b6f3a935fe66ed162b43ece9fe4cb4f (commit)
via 43e290527fd5d897c05b04c79e7e81f2ce428249 (commit)
via f4d95c94ab32be8b253593df5fddf9fc274e9275 (commit)
via 8aef4c2d8b20c7611583e4900c26f32bba79c1bd (commit)
from 8ab6fe018c764104bdfb0665e6ddfd560324f36b (commit)
Summary of changes:
src/common/xml.c | 4 +++-
src/folder_item_prefs.c | 1 +
src/imap_gtk.c | 2 +-
src/mh_gtk.c | 2 +-
src/mimeview.c | 4 ++--
src/plugins/rssyl/rssyl.c | 48 ++++++++++++++++++++++++++++++++++++-
src/plugins/rssyl/rssyl_cb_menu.c | 4 +++-
7 files changed, 58 insertions(+), 7 deletions(-)
- Log -----------------------------------------------------------------
commit 98e157fb30395f79d7088d7933832490b449c912
Author: Paul <paul at claws-mail.org>
Date: Fri Nov 23 11:39:29 2018 +0000
fix engrish
diff --git a/src/mimeview.c b/src/mimeview.c
index 60b2793..745dcab 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2297,8 +2297,8 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
if ((SHGetFileInfo((LPCWSTR)fn16, 0, &file_info, sizeof(SHFILEINFO), SHGFI_EXETYPE)) != 0) {
AlertValue val = alertpanel_full(_("Execute untrusted binary?"),
_("This attachment is an executable file. Executing "
- "untrusted binaries is dangerous and could probably "
- "lead to compromission of your computer.\n\n"
+ "untrusted binaries is dangerous and could compromise "
+ "your computer.\n\n"
"Do you want to run this file?"), GTK_STOCK_CANCEL,
_("Run binary"),
NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
commit 102f33c826cf6b4bad805161f9632012a14ee315
Author: Paul <paul at claws-mail.org>
Date: Fri Nov 23 07:17:23 2018 +0000
fix lost processing rules when renaming folder
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 71bd27b..a527bf7 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,7 +1,8 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
+ * This file (C) 2005-2018 Andrej Kacian <andrej at kacian.sk> and the
+ * Claws Mail team
*
* - callback handler functions for folderview rssyl context menu items
*
@@ -224,6 +225,7 @@ void rssyl_rename_cb(GtkAction *action,
g_free(new_folder);
folder_item_prefs_save_config(item);
+ prefs_matcher_write_config();
folder_write_list();
}
commit 6936a2c82b6f3a935fe66ed162b43ece9fe4cb4f
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Nov 19 11:23:35 2018 +0100
xml_parse_file() fails without assertion warning if xml_open_file() returns NULL.
This is not a programmer mistake, therefore an assertion
warning is not a good idea. xml_open_file() already shows
an assertion warning if necessary.
diff --git a/src/common/xml.c b/src/common/xml.c
index 874db1f..5ed7597 100644
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -88,6 +88,7 @@ XMLFile *xml_open_file(const gchar *path)
newfile->fp = claws_fopen(path, "rb");
if (!newfile->fp) {
+ FILE_OP_ERROR(path, "fopen");
g_free(newfile);
return NULL;
}
@@ -161,7 +162,8 @@ GNode *xml_parse_file(const gchar *path)
GNode *node;
file = xml_open_file(path);
- cm_return_val_if_fail(file != NULL, NULL);
+ if (file == NULL)
+ return NULL;
xml_get_dtd(file);
commit 43e290527fd5d897c05b04c79e7e81f2ce428249
Author: Paul <paul at claws-mail.org>
Date: Sun Nov 18 18:39:22 2018 +0000
mention inherited processing rules also, as this is what happens
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 4461a8a..e7b4a20 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -195,7 +195,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
"(if you want to create a folder to store subfolders\n"
"only and no mail, append '/' to the folder name)"),
_("NewFolder"),
- _("Inherit properties from parent folder"),
+ _("Inherit properties and processing rules from parent folder"),
&(prefs_common.inherit_folder_props));
if (!new_folder) return;
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index 3b1b7a0..b1a1623 100644
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -144,7 +144,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
new_folder = input_dialog_with_checkbtn(_("New folder"),
_("Input the name of new folder:"),
_("NewFolder"),
- _("Inherit properties from parent folder"),
+ _("Inherit properties and processing rules from parent folder"),
&(prefs_common.inherit_folder_props));
if (!new_folder) return;
AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
commit f4d95c94ab32be8b253593df5fddf9fc274e9275
Author: Paul <paul at claws-mail.org>
Date: Sun Nov 18 17:23:35 2018 +0000
fix bug where creating a new folder wth inheriting properties doesn't write processinf rules
after copying folder with 'inherit properties from parent folder' set,
the processing rules are (initially) present in the processing rules
dialogue, but are not actually written. So on a restart they are 'lost'.
This is probably the actual bug 4121, ' Moving a subfolder in another
folder erases its processing rules', rather than the description given.
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index b236008..d62f56b 100644
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -335,6 +335,7 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
*dest->prefs = tmp_prefs;
folder_item_prefs_save_config(dest);
+ prefs_matcher_write_config();
dest->collapsed = src->collapsed;
dest->thread_collapsed = src->thread_collapsed;
commit 8aef4c2d8b20c7611583e4900c26f32bba79c1bd
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Sat Nov 17 20:48:44 2018 +0100
Implement batch message removal for RSSyl.
This allows further optimization of how often the
.deleted file is read and written.
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index a4f39fb..7b0938c 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -868,6 +868,52 @@ static gint rssyl_remove_msg(Folder *folder, FolderItem *item, gint num)
return 0;
}
+static gint rssyl_remove_msgs(Folder *folder, FolderItem *item,
+ MsgInfoList *msglist, GHashTable *relation)
+{
+ gboolean need_scan = FALSE;
+ MsgInfoList *cur;
+ gchar *file;
+ gint processed = 0;
+
+ RFolderItem *ritem = (RFolderItem *)item;
+
+ g_return_val_if_fail(item != NULL, -1);
+
+ need_scan = mh_get_class()->scan_required(folder, item);
+
+ rssyl_deleted_update(ritem);
+
+ for (cur = msglist; cur != NULL; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+
+ if (msginfo == NULL)
+ continue;
+
+ file = rssyl_fetch_msg(folder, item, msginfo->msgnum);
+ if (file == NULL)
+ continue;
+
+ rssyl_deleted_add(ritem, file);
+
+ if (claws_unlink(file) < 0) {
+ FILE_OP_ERROR(file, "unlink");
+ g_free(file);
+ }
+
+ processed++;
+ }
+
+ if (processed > 0)
+ rssyl_deleted_store(ritem);
+ rssyl_deleted_free(ritem);
+
+ if (!need_scan)
+ item->mtime = time(NULL);
+
+ return processed;
+}
+
static gboolean rssyl_subscribe_uri(Folder *folder, const gchar *uri)
{
if (folder->klass != rssyl_folder_get_class())
@@ -982,7 +1028,7 @@ FolderClass *rssyl_folder_get_class()
rssyl_class.add_msg = rssyl_add_msg;
rssyl_class.add_msgs = rssyl_add_msgs;
rssyl_class.remove_msg = rssyl_remove_msg;
- rssyl_class.remove_msgs = NULL;
+ rssyl_class.remove_msgs = rssyl_remove_msgs;
rssyl_class.is_msg_changed = rssyl_is_msg_changed;
// rssyl_class.change_flags = rssyl_change_flags;
rssyl_class.change_flags = NULL;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list