[Commits] [SCM] claws branch, master, updated. 3.17.0-104-g1cfe78b

[ticho at claws-mail.org]

The branch, master has been updated
       via  1cfe78b4d78fa274e90598a2a8b48bc2ea724a16 (commit)
       via  14d7dcfd5a42e38e2d0230e4ec7716350a27c970 (commit)
      from  d96814391e22c8c8f1c73c850cc71b3fb0a3a3e8 (commit)

Summary of changes:
 src/common/tests/Makefile.am                            |    4 ++--
 src/common/tests/codeconv_test.c                        |    1 +
 src/common/tests/mock_prefs_common_get_flush_metadata.h |    5 +++++
 src/common/tests/xml_test.c                             |    1 +
 src/crash.c                                             |    2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 src/common/tests/mock_prefs_common_get_flush_metadata.h


- Log -----------------------------------------------------------------
commit 1cfe78b4d78fa274e90598a2a8b48bc2ea724a16
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Oct 8 10:34:08 2018 +0200

    Fix unit tests building, broken after the file-utils addition.

diff --git a/src/common/tests/Makefile.am b/src/common/tests/Makefile.am
index 7b18f88..e69e4ee 100644
--- a/src/common/tests/Makefile.am
+++ b/src/common/tests/Makefile.am
@@ -12,11 +12,11 @@ AM_CPPFLAGS = \
 
 TEST_PROGS += xml_test
 xml_test_SOURCES = xml_test.c
-xml_test_LDADD = $(common_ldadd) ../xml.o ../stringtable.o ../utils.o ../codeconv.o ../quoted-printable.o ../unmime.o
+xml_test_LDADD = $(common_ldadd) ../xml.o ../stringtable.o ../utils.o ../codeconv.o ../quoted-printable.o ../unmime.o ../file-utils.o
 
 TEST_PROGS += codeconv_test
 codeconv_test_SOURCES = codeconv_test.c
-codeconv_test_LDADD = $(common_ldadd) ../codeconv.o ../utils.o ../quoted-printable.o ../unmime.o
+codeconv_test_LDADD = $(common_ldadd) ../codeconv.o ../utils.o ../quoted-printable.o ../unmime.o ../file-utils.o
 
 TEST_PROGS += md5_test
 md5_test_SOURCES = md5_test.c
diff --git a/src/common/tests/codeconv_test.c b/src/common/tests/codeconv_test.c
index 3b93eae..3cf7437 100644
--- a/src/common/tests/codeconv_test.c
+++ b/src/common/tests/codeconv_test.c
@@ -3,6 +3,7 @@
 #include "codeconv.h"
 
 #include "mock_prefs_common_get_use_shred.h"
+#include "mock_prefs_common_get_flush_metadata.h"
 
 struct td {
 	gchar *pre; /* Input string */
diff --git a/src/common/tests/mock_prefs_common_get_flush_metadata.h b/src/common/tests/mock_prefs_common_get_flush_metadata.h
new file mode 100644
index 0000000..d9f6a12
--- /dev/null
+++ b/src/common/tests/mock_prefs_common_get_flush_metadata.h
@@ -0,0 +1,5 @@
+gboolean prefs_common_get_flush_metadata(void)
+{
+	return FALSE;
+}
+
diff --git a/src/common/tests/xml_test.c b/src/common/tests/xml_test.c
index 1e58d8d..0159712 100644
--- a/src/common/tests/xml_test.c
+++ b/src/common/tests/xml_test.c
@@ -3,6 +3,7 @@
 #include "xml.h"
 
 #include "mock_prefs_common_get_use_shred.h"
+#include "mock_prefs_common_get_flush_metadata.h"
 
 #define DATADIR "data/"
 

commit 14d7dcfd5a42e38e2d0230e4ec7716350a27c970
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Oct 8 10:33:26 2018 +0200

    Fix file-utils related compiler warnings in crash.c.

diff --git a/src/crash.c b/src/crash.c
index edac5c7..4a5fcc9 100644
--- a/src/crash.c
+++ b/src/crash.c
@@ -48,7 +48,7 @@
 #include "main.h"
 #include "claws.h"
 #include "crash.h"
-#include "utils.h"
+#include "file-utils.h"
 #include "filesel.h"
 #include "version.h"
 #include "prefs_common.h"

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


hooks/post-receive
-- 
Claws Mail