Update CM patches for 3.17.3 release

diff --git a/patches/claws-mail-3.17.1/99-manual.patch b/patches/claws-mail-3.17.1/99-manual.patch
deleted file mode 100755 (executable)
index 1f70733..0000000
--- a/patches/claws-mail-3.17.1/99-manual.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-diff -ruN claws-mail-3.17.0-orig/manual/dist/pdf/Makefile.in claws-mail-3.17.0/manual/dist/pdf/Makefile.in
---- claws-mail-3.17.0-orig/manual/dist/pdf/Makefile.in 2018-08-15 19:45:00.000000000 +0200
-+++ claws-mail-3.17.0/manual/dist/pdf/Makefile.in      2018-08-23 13:38:38.095917109 +0200
-@@ -647,7 +647,7 @@
- @MANUAL_PDF_TRUE@     ../../plugins.xml \
- @MANUAL_PDF_TRUE@     ../../starting.xml \
- @MANUAL_PDF_TRUE@     ../../claws-mail-manual.xml
--@MANUAL_PDF_TRUE@     -docbook2pdf -o . ../../claws-mail-manual.xml
-+@MANUAL_PDF_TRUE@     -docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
- 
- @MANUAL_PDF_TRUE@maintainer-clean:
- @MANUAL_PDF_TRUE@     -rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl

diff --git a/patches/claws-mail-3.17.1/01-etpan-sasl-plugin-path.patch b/patches/claws-mail-3.17.3/01-etpan-sasl-plugin-path.patch
similarity index 100%
rename from patches/claws-mail-3.17.1/01-etpan-sasl-plugin-path.patch
rename to patches/claws-mail-3.17.3/01-etpan-sasl-plugin-path.patch

diff --git a/patches/claws-mail-3.17.3/99-mimeview-alertpanel-api-fix.patch b/patches/claws-mail-3.17.3/99-mimeview-alertpanel-api-fix.patch
new file mode 100755 (executable)
index 0000000..f30d8eb
--- /dev/null
+++ b/patches/claws-mail-3.17.3/99-mimeview-alertpanel-api-fix.patch
@@ -0,0 +1,39 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+commit fc3ae4dc1065a1cc42a0e3ea0f056a8eb7da928d
+Author: Andrej Kacian <ticho@claws-mail.org>
+Date:   Sat Dec 29 13:19:30 2018 +0100
+
+    Fix alertpanel API use in win32 part of mimeview.c
+
+diff --git a/src/common/codeconv.h b/src/common/codeconv.h
+index 270498558..862d303dd 100644
+--- a/src/common/codeconv.h
++++ b/src/common/codeconv.h
+@@ -178,6 +178,11 @@ struct _CodeConverter
+ #define C_INTERNAL            C_UTF_8
+ #define CS_INTERNAL           CS_UTF_8
+ 
++typedef enum {
++      CODECONV_NOSPACE = -2,
++      CODECONV_FAIL = -1,
++      CODECONV_OK   = 0
++} CodeconvResult;
+ 
+ void conv_utf8todisp  (gchar *outbuf, gint outlen, const gchar *inbuf);
+ void conv_localetodisp        (gchar *outbuf, gint outlen, const gchar *inbuf);
+diff --git a/src/mimeview.c b/src/mimeview.c
+index b7068eaf1..daaac32d4 100644
+--- a/src/mimeview.c
++++ b/src/mimeview.c
+@@ -2294,7 +2294,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
+                                       "your computer.\n\n"
+                                       "Do you want to run this file?"), GTK_STOCK_CANCEL, 
+                                       _("Run binary"),
+-                                    NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
++                                    NULL, ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
+               if (val == G_ALERTALTERNATE) {
+                       debug_print("executing binary\n");
+                       ShellExecute(NULL, L"open", (LPCWSTR)fn16, NULL, NULL, SW_SHOW);

diff --git a/patches/claws-mail-3.17.3/99-utils-c-include-fix.patch b/patches/claws-mail-3.17.3/99-utils-c-include-fix.patch
new file mode 100755 (executable)
index 0000000..398833e
--- /dev/null
+++ b/patches/claws-mail-3.17.3/99-utils-c-include-fix.patch
@@ -0,0 +1,20 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+diff -ruN claws-mail-3.17.3-orig/src/common/utils.c claws-mail-3.17.3/src/common/utils.c
+--- claws-mail-3.17.3-orig/src/common/utils.c  2018-12-21 10:33:36.000000000 +0100
++++ claws-mail-3.17.3/src/common/utils.c       2018-12-22 14:04:31.971564676 +0100
+@@ -49,8 +49,10 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <sys/param.h>
+-#ifndef G_OS_WIN32
+-#include <sys/socket.h>
++#ifdef G_OS_WIN32
++#  include <ws2tcpip.h>
++#else
++#  include <sys/socket.h>
+ #endif
+ 
+ #if (HAVE_WCTYPE_H && HAVE_WCHAR_H)