lib-storage/index/imapc, lib-imap-client: Move imapc_settings into lib-imap-client

diff --git a/src/lib-imap-client/Makefile.am b/src/lib-imap-client/Makefile.am
index 445fe2cad02d8da3f8586bae64ce68ead8a7119c..24c36fba3dce65881cae761f420e4478e11da952 100644 (file)
--- a/src/lib-imap-client/Makefile.am
+++ b/src/lib-imap-client/Makefile.am
@@ -13,13 +13,15 @@ AM_CPPFLAGS = \
 libimap_client_la_SOURCES = \
        imapc-client.c \
        imapc-connection.c \
-       imapc-msgmap.c
+       imapc-msgmap.c \
+       imapc-settings.c
 
 headers = \
        imapc-client.h \
        imapc-client-private.h \
        imapc-connection.h \
-       imapc-msgmap.h
+       imapc-msgmap.h \
+       imapc-settings.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-imap-client/imapc-settings.c
similarity index 99%
rename from src/lib-storage/index/imapc/imapc-settings.c
rename to src/lib-imap-client/imapc-settings.c
index 036ccac29a82a2b7206b2dc113844b0ee8553e54..f5f56f979f3f3d28b8aa355e7bb18a9fa80519fb 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-imap-client/imapc-settings.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "settings-parser.h"
-#include "mail-storage-settings.h"
 #include "imapc-settings.h"
 
 #undef DEF

diff --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-imap-client/imapc-settings.h
similarity index 100%
rename from src/lib-storage/index/imapc/imapc-settings.h
rename to src/lib-imap-client/imapc-settings.h

diff --git a/src/lib-storage/index/imapc/Makefile.am b/src/lib-storage/index/imapc/Makefile.am
index f162bd6b2bef013fca7794219ee88de78a64ed2b..e0711fc11f501e004280bb59c99b3f54eec1c69f 100644 (file)
--- a/src/lib-storage/index/imapc/Makefile.am
+++ b/src/lib-storage/index/imapc/Makefile.am
@@ -22,7 +22,6 @@ libstorage_imapc_la_SOURCES = \
        imapc-mailbox.c \
        imapc-save.c \
        imapc-search.c \
-       imapc-settings.c \
        imapc-sync.c \
        imapc-storage.c
 
@@ -31,7 +30,6 @@ headers = \
        imapc-list.h \
        imapc-mail.h \
        imapc-search.h \
-       imapc-settings.h \
        imapc-storage.h \
        imapc-sync.h