[Commits] [SCM] claws branch, master, updated. 3.17.0-32-g0b75838

[Colin]

The branch, master has been updated
       via  0b7583815089737f643414c7ad585c86b16d71ec (commit)
       via  7c26149b4d595af1c428a8e2a1c3623556a4b6ed (commit)
       via  1ad759a671ce5e856956aadb52ca32f2e2792177 (commit)
      from  48ba0be464519da10458f55d0587a6a67c630556 (commit)

Summary of changes:
 src/action.c    |    1 +
 src/advsearch.c |    2 +-
 src/compose.c   |   15 +++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 0b7583815089737f643414c7ad585c86b16d71ec
Author: Olivier Brunel <jjk at jjacky.com>
Date:   Wed Dec 27 21:59:40 2017 +0100

    Preserve flags & tags when re-editing a message
    
    When re-editing a message, let's preserve its flags (color labels, etc)
    and tags. Can be especially useful for those who use such things on queued
    messages, and find themselves re-editing messages afterwards but before
    actually sending them.

diff --git a/src/compose.c b/src/compose.c
index 5583ba4..0cb01fb 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2366,6 +2366,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 	}
 
 	compose->targetinfo = procmsg_msginfo_copy(msginfo);
+	compose->targetinfo->tags = g_slist_copy(msginfo->tags);
 
 	compose_extract_original_charset(compose);
 
@@ -6300,6 +6301,20 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
 	} else
 		*msgpath = tmp;
 
+	if (compose->mode == COMPOSE_REEDIT && compose->targetinfo) {
+		MsgInfo *mi = folder_item_get_msginfo(queue, num);
+		if (mi) {
+			procmsg_msginfo_change_flags(mi,
+				compose->targetinfo->flags.perm_flags,
+				compose->targetinfo->flags.tmp_flags & ~(MSG_COPY | MSG_MOVE | MSG_MOVE_DONE),
+				0, 0);
+
+			g_slist_free(mi->tags);
+			mi->tags = g_slist_copy(compose->targetinfo->tags);
+			procmsg_msginfo_free(&mi);
+		}
+	}
+
 	if (compose->mode == COMPOSE_REEDIT && remove_reedit_target) {
 		compose_remove_reedit_target(compose, FALSE);
 	}

commit 7c26149b4d595af1c428a8e2a1c3623556a4b6ed
Author: Olivier Brunel <jjk at jjacky.com>
Date:   Wed Dec 27 21:53:17 2017 +0100

    action: Keep selection set afterwards
    
    Upon running (filtering) actions, the current selection was lost (due to
    refreshing the current folder); Let's restore it.

diff --git a/src/action.c b/src/action.c
index c6dd10f..af62f37 100644
--- a/src/action.c
+++ b/src/action.c
@@ -627,6 +627,7 @@ static void mainwin_actions_execute(MainWindow *mainwin, guint action_nb,
 
 	msg_list = summary_get_selected_msg_list(mainwin->summaryview);
 	message_actions_execute(mainwin->messageview, action_nb, msg_list);
+	summary_select_by_msg_list(mainwin->summaryview, msg_list);
 	g_slist_free(msg_list);
 }
 

commit 1ad759a671ce5e856956aadb52ca32f2e2792177
Author: Olivier Brunel <jjk at jjacky.com>
Date:   Wed Aug 2 20:48:58 2017 +0200

    Speed-up searches in References via "x"
    
    Since commit 5c9f9e47 (in 2001!) the header "References" is actually
    cached in MsgInfo, so searching it can be substantially faster if "x"
    expands to 'references' instead of 'header "References"', much like with
    'i' (messageid) or 'I' (inreplyto).

diff --git a/src/advsearch.c b/src/advsearch.c
index ecd3acd..ccfad6c 100644
--- a/src/advsearch.c
+++ b/src/advsearch.c
@@ -186,7 +186,7 @@ gchar *advsearch_expand_search_string(const gchar *search_string)
 		{ "tg", "tag",				1,	TRUE,	TRUE  },
 		{ "T",	"marked",			0,	FALSE,	FALSE },
 		{ "U",	"unread",			0,	FALSE,	FALSE },
-		{ "x",	"header \"References\"",	1,	TRUE,	TRUE  },
+		{ "x",	"references",			1,	TRUE,	TRUE  },
 		{ "X",  "test",				1,	FALSE,  FALSE },
 		{ "y",	"header \"X-Label\"",		1,	TRUE,	TRUE  },
 		{ "&",	"&",				0,	FALSE,	FALSE },

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail