talons

commit 7b573007cd8be18dc7ce792cd3f03f6201592743
parent f075b5064e96a9fdcc8e666c8e65f0242dabf5ff
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 18 Jun 2017 21:46:58 +0200

Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws

Diffstat:
M
AUTHORS
 | 
1
+
M
autogen.sh
 | 
19
++++++++++++++++---
M
src/gtk/authors.h
 | 
1
+
M
src/messageview.c
 | 
2
+-
M
src/plugins/att_remover/att_remover.c
 | 
9
+++++++--
M
src/plugins/fancy/claws.def
 | 
1
+

6 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -312,3 +312,4 @@ contributors (in addition to the above; based on Changelog)
 	Darac Marjal
 	Ashish Gupta
 	Olivier Brunel
+	Michael Vilain
diff --git a/autogen.sh b/autogen.sh
@@ -12,9 +12,9 @@ if [ "$bisonver" = "" ]; then
 fi
 
 if [ "$LEX" != "" ]; then
-	flexver=`$LEX --version|sed "s/.* //"`
+	flexver=`$LEX --version|awk '{print $2}'`
 else
-	flexver=`flex --version|sed "s/.* //"`
+	flexver=`flex --version|awk '{print $2}'`
 fi
 
 if [ "$flexver" = "" ]; then
@@ -36,8 +36,21 @@ else
 	fi
 fi
 
+case `uname` in
+	Darwin*)
+		if [ "`glibtoolize --version`" = "" ]; then
+			echo MacOS requires glibtool from either Macport or brew
+			exit 1
+		fi
+		LIBTOOL="glibtoolize --force --copy"
+		;;
+	*)
+		LIBTOOL="libtoolize --force --copy"
+		;;
+esac
+
 aclocal -I m4 \
-  && libtoolize --force --copy \
+  && ${LIBTOOL} \
   && autoheader \
   && automake --add-missing --foreign --copy \
   && autoconf 
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -294,6 +294,7 @@ static char *CONTRIBS_LIST[] = {
 "Petr Vanek",
 "Jeroen Versteeg",
 "Kevin Vigor",
+"Michael Vilain",
 "Johan Vromans",
 "Botalov Vyacheslav",
 "Radek Vybiral",
diff --git a/src/messageview.c b/src/messageview.c
@@ -966,7 +966,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
 	/* Date */
 	get_rfc822_date(buf_date, sizeof(buf_date));
-	if (fprintf(fp, "Date: %s\n", buf) < 0)
+	if (fprintf(fp, "Date: %s\n", buf_date) < 0)
 		goto FILE_ERROR;
 
 	/* From */
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
@@ -129,9 +129,14 @@ static gint save_new_message(MsgInfo *oldmsg, MsgInfo *newmsg, MimeInfo *info,
 		flags.tmp_flags &= ~MSG_HAS_ATTACHMENT;
 
 	oldmsg->flags.perm_flags &= ~MSG_LOCKED;
+	msgnum = folder_item_add_msg(item, finalmsg->plaintext_file, &flags, TRUE);
+	if (msgnum < 0) {
+		g_warning("could not add message without attachments");
+		procmsg_msginfo_free(&newmsg);
+		procmsg_msginfo_free(&finalmsg);
+		return msgnum;
+	}
 	folder_item_remove_msg(item, oldmsg->msgnum);
-	msgnum = folder_item_add_msg(item, finalmsg->plaintext_file, 
-			&flags, TRUE);
 	finalmsg->msgnum = msgnum;
 	procmsg_msginfo_free(&newmsg);
 	procmsg_msginfo_free(&finalmsg);
diff --git a/src/plugins/fancy/claws.def b/src/plugins/fancy/claws.def
@@ -18,6 +18,7 @@ debug_srcname
 end_address_completion
 extract_address
 file_exist
+file_read_to_str_no_recode
 filesel_select_file_open
 filesel_select_file_save
 folder_find_item_from_identifier