commit f7b61e7f33aed0b07003d0e71a80023b1001c6fd
parent 6a3c7a527721fde7cda8a7f287d44eb5ff97c153
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Fri, 31 Aug 2018 13:39:04 +0200
Moved codeconv.[ch] and unmime.[ch] to common/ subdir.
That's where they belong. This also clears up a few ugly
cases of other files in common including "../codeconv.h".
Diffstat:
10 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -137,7 +137,6 @@ claws_mail_SOURCES = \
alertpanel.c \
autofaces.c \
avatars.c \
- codeconv.c \
compose.c \
crash.c \
customheader.c \
@@ -146,7 +145,7 @@ claws_mail_SOURCES = \
enriched.c \
entity.c \
export.c \
- file_checker.c \
+ file_checker.c \
filtering.c \
folder.c \
folder_item_prefs.c \
@@ -236,7 +235,6 @@ claws_mail_SOURCES = \
textview.c \
toolbar.c \
undo.c \
- unmime.c \
uri_opener.c \
wizard.c \
$(abook_source)
@@ -257,7 +255,6 @@ claws_mailinclude_HEADERS = \
alertpanel.h \
autofaces.h \
avatars.h \
- codeconv.h \
compose.h \
crash.h \
customheader.h \
@@ -358,7 +355,6 @@ claws_mailinclude_HEADERS = \
textview.h \
toolbar.h \
undo.h \
- unmime.h \
uri_opener.h \
viewtypes.h \
wizard.h \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -19,6 +19,7 @@ arch_header =
endif
libclawscommon_la_SOURCES = $(arch_sources) \
+ codeconv.c \
hooks.c \
log.c \
md5.c \
@@ -43,10 +44,12 @@ libclawscommon_la_SOURCES = $(arch_sources) \
uuencode.c \
xml.c \
xmlprops.c \
- pkcs5_pbkdf2.c
+ pkcs5_pbkdf2.c \
+ unmime.c
clawscommonincludedir = $(pkgincludedir)/common
clawscommoninclude_HEADERS = $(arch_headers) \
+ codeconv.h \
defs.h \
hooks.h \
log.h \
@@ -75,7 +78,8 @@ clawscommoninclude_HEADERS = $(arch_headers) \
version.h \
xml.h \
xmlprops.h \
- pkcs5_pbkdf2.h
+ pkcs5_pbkdf2.h \
+ unmime.h
AM_CPPFLAGS = \
-I$(top_srcdir)/intl \
diff --git a/src/codeconv.c b/src/common/codeconv.c
diff --git a/src/codeconv.h b/src/common/codeconv.h
diff --git a/src/common/template.c b/src/common/template.c
@@ -28,7 +28,7 @@
#include "utils.h"
#include "template.h"
-#include "../codeconv.h"
+#include "codeconv.h"
static GSList *template_list;
diff --git a/src/unmime.c b/src/common/unmime.c
diff --git a/src/unmime.h b/src/common/unmime.h
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -83,7 +83,7 @@
#include "utils.h"
#include "socket.h"
-#include "../codeconv.h"
+#include "codeconv.h"
#include "tlds.h"
#define BUFFSIZE 8192
diff --git a/src/common/xml.c b/src/common/xml.c
@@ -24,8 +24,7 @@
#include "xml.h"
#include "utils.h"
-/* UGLY! */
-#include "../codeconv.h"
+#include "codeconv.h"
#define SPARSE_MEMORY
/* if this is defined all attr.names and tag.names are stored
diff --git a/src/plugins/rssyl/libfeed/parser_opml.c b/src/plugins/rssyl/libfeed/parser_opml.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <ctype.h>
-#include <codeconv.h>
+#include <common/codeconv.h>
#include "feed.h"
