Update to 1.9.12.

Noticed by:	Martin Hamant <mh@accelance.fr>

10 files changed, 22 insertions, 162 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index b83586ad105..c44c7066ba1 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	1.9.11
-PORTREVISION=	1
+PORTVERSION=	1.9.12
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 9fb622220b3..bbf633a50a5 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-1.9.11.tar.bz2) = 20e5d1796c45ef93520fb3b6defbf857
-SIZE (sylpheed-claws-1.9.11.tar.bz2) = 3233166
+MD5 (sylpheed-claws-1.9.12.tar.bz2) = c7cdfe6ac9afacd680cb8fe58eb9da79
+SIZE (sylpheed-claws-1.9.12.tar.bz2) = 3297470
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/claws-mail/files/patch-src-procmsg.c b/mail/claws-mail/files/patch-src-procmsg.c
deleted file mode 100644
index 6a05e44f63b..00000000000
--- a/mail/claws-mail/files/patch-src-procmsg.c
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: src/procmsg.c
-===================================================================
-RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
-retrieving revision 1.150.2.23
-retrieving revision 1.150.2.24
-diff -u -r1.150.2.23 -r1.150.2.24
---- src/procmsg.c	30 Apr 2005 16:47:39 -0000	1.150.2.23
-+++ src/procmsg.c	19 May 2005 19:53:29 -0000	1.150.2.24
-@@ -662,13 +662,6 @@
- 	FILE *fp;
- 	int hnum;
- 	gchar buf[BUFFSIZE];
--	
--	g_return_val_if_fail(file != NULL, NULL);
--
--	if ((fp = fopen(file, "rb")) == NULL) {
--		FILE_OP_ERROR(file, "fopen");
--		return NULL;
--	}
- 	static HeaderEntry qentry[] = {{"S:",    NULL, FALSE},
- 				       {"SSV:",  NULL, FALSE},
- 				       {"R:",    NULL, FALSE},
-@@ -682,6 +675,13 @@
- 				       {"X-Sylpheed-Encrypt:", NULL, FALSE},
- 				       {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
- 				       {NULL,    NULL, FALSE}};
-+	
-+	g_return_val_if_fail(file != NULL, NULL);
-+
-+	if ((fp = fopen(file, "rb")) == NULL) {
-+		FILE_OP_ERROR(file, "fopen");
-+		return NULL;
-+	}
- 
- 	while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
- 	       != -1) {
-
-
-Index: src/procmsg.c
-===================================================================
-RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
-retrieving revision 1.150.2.24
-retrieving revision 1.150.2.25
-diff -u -r1.150.2.24 -r1.150.2.25
---- src/procmsg.c	19 May 2005 19:53:29 -0000	1.150.2.24
-+++ src/procmsg.c	20 May 2005 16:24:11 -0000	1.150.2.25
-@@ -722,9 +722,9 @@
- 	cur = orig;
- 	while (cur) {
- 		gchar *file;
-+		PrefsAccount *ac = procmsg_get_account_from_file(file);
- 		msg = (MsgInfo *)cur->data;
- 		file = folder_item_fetch_msg(queue, msg->msgnum);
--		PrefsAccount *ac = procmsg_get_account_from_file(file);
- 		g_free(file);
- 
- 		if (last_account == NULL || (ac != NULL && ac == last_account)) {
diff --git a/mail/claws-mail/files/patch-src-send_message.c b/mail/claws-mail/files/patch-src-send_message.c
deleted file mode 100644
index 53bf482e419..00000000000
--- a/mail/claws-mail/files/patch-src-send_message.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/send_message.c
-===================================================================
-RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/send_message.c,v
-retrieving revision 1.17.2.9
-retrieving revision 1.17.2.10
-diff -u -r1.17.2.9 -r1.17.2.10
---- src/send_message.c	30 Apr 2005 16:47:40 -0000	1.17.2.9
-+++ src/send_message.c	20 May 2005 16:24:12 -0000	1.17.2.10
-@@ -333,7 +333,8 @@
- 	 * easier.
- 	 */
- 	if (!keep_session || ret != 0) {
--		smtp_quit(session);
-+		if (session_is_connected(session))
-+			smtp_quit(session);
- 		while (session_is_connected(session))
- 			gtk_main_iteration();
- 		session_destroy(session);
-
-
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index a13da4977cd..0803351c322 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -43,6 +43,7 @@ include/sylpheed-claws/common/string_match.h
 include/sylpheed-claws/common/stringtable.h
 include/sylpheed-claws/common/sylpheed.h
 include/sylpheed-claws/common/template.h
+include/sylpheed-claws/common/timing.h
 include/sylpheed-claws/common/utils.h
 include/sylpheed-claws/common/uuencode.h
 include/sylpheed-claws/common/version.h
@@ -141,6 +142,7 @@ include/sylpheed-claws/pop.h
 include/sylpheed-claws/prefs_account.h
 include/sylpheed-claws/prefs_actions.h
 include/sylpheed-claws/prefs_common.h
+include/sylpheed-claws/prefs_compose_writing.h
 include/sylpheed-claws/prefs_customheader.h
 include/sylpheed-claws/prefs_display_header.h
 include/sylpheed-claws/prefs_ext_prog.h
@@ -151,8 +153,14 @@ include/sylpheed-claws/prefs_fonts.h
 include/sylpheed-claws/prefs_gtk.h
 include/sylpheed-claws/prefs_image_viewer.h
 include/sylpheed-claws/prefs_matcher.h
+include/sylpheed-claws/prefs_message.h
 include/sylpheed-claws/prefs_msg_colors.h
+include/sylpheed-claws/prefs_other.h
+include/sylpheed-claws/prefs_quote.h
+include/sylpheed-claws/prefs_receive.h
+include/sylpheed-claws/prefs_send.h
 include/sylpheed-claws/prefs_spelling.h
+include/sylpheed-claws/prefs_summaries.h
 include/sylpheed-claws/prefs_summary_column.h
 include/sylpheed-claws/prefs_template.h
 include/sylpheed-claws/prefs_themes.h
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index b83586ad105..c44c7066ba1 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	1.9.11
-PORTREVISION=	1
+PORTVERSION=	1.9.12
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index 9fb622220b3..bbf633a50a5 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-1.9.11.tar.bz2) = 20e5d1796c45ef93520fb3b6defbf857
-SIZE (sylpheed-claws-1.9.11.tar.bz2) = 3233166
+MD5 (sylpheed-claws-1.9.12.tar.bz2) = c7cdfe6ac9afacd680cb8fe58eb9da79
+SIZE (sylpheed-claws-1.9.12.tar.bz2) = 3297470
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/sylpheed-claws/files/patch-src-procmsg.c b/mail/sylpheed-claws/files/patch-src-procmsg.c
deleted file mode 100644
index 6a05e44f63b..00000000000
--- a/mail/sylpheed-claws/files/patch-src-procmsg.c
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: src/procmsg.c
-===================================================================
-RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
-retrieving revision 1.150.2.23
-retrieving revision 1.150.2.24
-diff -u -r1.150.2.23 -r1.150.2.24
---- src/procmsg.c	30 Apr 2005 16:47:39 -0000	1.150.2.23
-+++ src/procmsg.c	19 May 2005 19:53:29 -0000	1.150.2.24
-@@ -662,13 +662,6 @@
- 	FILE *fp;
- 	int hnum;
- 	gchar buf[BUFFSIZE];
--	
--	g_return_val_if_fail(file != NULL, NULL);
--
--	if ((fp = fopen(file, "rb")) == NULL) {
--		FILE_OP_ERROR(file, "fopen");
--		return NULL;
--	}
- 	static HeaderEntry qentry[] = {{"S:",    NULL, FALSE},
- 				       {"SSV:",  NULL, FALSE},
- 				       {"R:",    NULL, FALSE},
-@@ -682,6 +675,13 @@
- 				       {"X-Sylpheed-Encrypt:", NULL, FALSE},
- 				       {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
- 				       {NULL,    NULL, FALSE}};
-+	
-+	g_return_val_if_fail(file != NULL, NULL);
-+
-+	if ((fp = fopen(file, "rb")) == NULL) {
-+		FILE_OP_ERROR(file, "fopen");
-+		return NULL;
-+	}
- 
- 	while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
- 	       != -1) {
-
-
-Index: src/procmsg.c
-===================================================================
-RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
-retrieving revision 1.150.2.24
-retrieving revision 1.150.2.25
-diff -u -r1.150.2.24 -r1.150.2.25
---- src/procmsg.c	19 May 2005 19:53:29 -0000	1.150.2.24
-+++ src/procmsg.c	20 May 2005 16:24:11 -0000	1.150.2.25
-@@ -722,9 +722,9 @@
- 	cur = orig;
- 	while (cur) {
- 		gchar *file;
-+		PrefsAccount *ac = procmsg_get_account_from_file(file);
- 		msg = (MsgInfo *)cur->data;
- 		file = folder_item_fetch_msg(queue, msg->msgnum);
--		PrefsAccount *ac = procmsg_get_account_from_file(file);
- 		g_free(file);
- 
- 		if (last_account == NULL || (ac != NULL && ac == last_account)) {
diff --git a/mail/sylpheed-claws/files/patch-src-send_message.c b/mail/sylpheed-claws/files/patch-src-send_message.c
deleted file mode 100644
index 53bf482e419..00000000000
--- a/mail/sylpheed-claws/files/patch-src-send_message.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/send_message.c
-===================================================================
-RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/send_message.c,v
-retrieving revision 1.17.2.9
-retrieving revision 1.17.2.10
-diff -u -r1.17.2.9 -r1.17.2.10
---- src/send_message.c	30 Apr 2005 16:47:40 -0000	1.17.2.9
-+++ src/send_message.c	20 May 2005 16:24:12 -0000	1.17.2.10
-@@ -333,7 +333,8 @@
- 	 * easier.
- 	 */
- 	if (!keep_session || ret != 0) {
--		smtp_quit(session);
-+		if (session_is_connected(session))
-+			smtp_quit(session);
- 		while (session_is_connected(session))
- 			gtk_main_iteration();
- 		session_destroy(session);
-
-
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index a13da4977cd..0803351c322 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -43,6 +43,7 @@ include/sylpheed-claws/common/string_match.h
 include/sylpheed-claws/common/stringtable.h
 include/sylpheed-claws/common/sylpheed.h
 include/sylpheed-claws/common/template.h
+include/sylpheed-claws/common/timing.h
 include/sylpheed-claws/common/utils.h
 include/sylpheed-claws/common/uuencode.h
 include/sylpheed-claws/common/version.h
@@ -141,6 +142,7 @@ include/sylpheed-claws/pop.h
 include/sylpheed-claws/prefs_account.h
 include/sylpheed-claws/prefs_actions.h
 include/sylpheed-claws/prefs_common.h
+include/sylpheed-claws/prefs_compose_writing.h
 include/sylpheed-claws/prefs_customheader.h
 include/sylpheed-claws/prefs_display_header.h
 include/sylpheed-claws/prefs_ext_prog.h
@@ -151,8 +153,14 @@ include/sylpheed-claws/prefs_fonts.h
 include/sylpheed-claws/prefs_gtk.h
 include/sylpheed-claws/prefs_image_viewer.h
 include/sylpheed-claws/prefs_matcher.h
+include/sylpheed-claws/prefs_message.h
 include/sylpheed-claws/prefs_msg_colors.h
+include/sylpheed-claws/prefs_other.h
+include/sylpheed-claws/prefs_quote.h
+include/sylpheed-claws/prefs_receive.h
+include/sylpheed-claws/prefs_send.h
 include/sylpheed-claws/prefs_spelling.h
+include/sylpheed-claws/prefs_summaries.h
 include/sylpheed-claws/prefs_summary_column.h
 include/sylpheed-claws/prefs_template.h
 include/sylpheed-claws/prefs_themes.h