imap-login: Renamed client.[ch] to imap-login-client.[ch]

This allows installing the imap-login-client.h without conflicting.

diff --git a/src/imap-login/Makefile.am b/src/imap-login/Makefile.am
index 0f5d3116efd3a38fd10a22eeae5cd508640a15dc..a3f5d27d6f17550bd03c40f78bf6efcddcaf58f4 100644 (file)
--- a/src/imap-login/Makefile.am
+++ b/src/imap-login/Makefile.am
@@ -20,14 +20,14 @@ imap_login_DEPENDENCIES = \
        $(LIBDOVECOT_DEPS)
 
 imap_login_SOURCES = \
-       client.c \
+       imap-login-client.c \
        client-authenticate.c \
        imap-login-commands.c \
        imap-login-settings.c \
        imap-proxy.c
 
 noinst_HEADERS = \
-       client.h \
+       imap-login-client.h \
        client-authenticate.h \
        imap-login-commands.h \
        imap-login-settings.h \

diff --git a/src/imap-login/client-authenticate.c b/src/imap-login/client-authenticate.c
index 47fcf168a976739c370862d74f50e38ccb292df3..829ad4a495dd93b681283d8f9325068f1a0e44e4 100644 (file)
--- a/src/imap-login/client-authenticate.c
+++ b/src/imap-login/client-authenticate.c
@@ -14,7 +14,7 @@
 #include "imap-parser.h"
 #include "imap-url.h"
 #include "auth-client.h"
-#include "client.h"
+#include "imap-login-client.h"
 #include "client-authenticate.h"
 #include "imap-proxy.h"
 

diff --git a/src/imap-login/client.c b/src/imap-login/imap-login-client.c
similarity index 99%
rename from src/imap-login/client.c
rename to src/imap-login/imap-login-client.c
index 7b833e1f75f5768ddffbe1dffcf335c15434115b..b1a6d67a7a7316b30c5a1987e29545c126ce9564 100644 (file)
--- a/src/imap-login/client.c
+++ b/src/imap-login/imap-login-client.c
@@ -14,7 +14,7 @@
 #include "master-service.h"
 #include "master-service-ssl-settings.h"
 #include "master-auth.h"
-#include "client.h"
+#include "imap-login-client.h"
 #include "client-authenticate.h"
 #include "auth-client.h"
 #include "ssl-proxy.h"

diff --git a/src/imap-login/client.h b/src/imap-login/imap-login-client.h
similarity index 96%
rename from src/imap-login/client.h
rename to src/imap-login/imap-login-client.h
index b622749a492d97d704c9459c8bdd77cafab5033b..2a38949c6e1c0c75a7d9f8d0405f98a7a7fab998 100644 (file)
--- a/src/imap-login/client.h
+++ b/src/imap-login/imap-login-client.h
@@ -1,5 +1,5 @@
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef IMAP_LOGIN_CLIENT_H
+#define IMAP_LOGIN_CLIENT_H
 
 #include "net.h"
 #include "imap-id.h"

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index 527d6a030ecec5f65bf767399ee958d3f73279ab..3b02cb3f93fb954208bb022d340191ceb8f22054 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -10,7 +10,7 @@
 #include "str-sanitize.h"
 #include "safe-memset.h"
 #include "dsasl-client.h"
-#include "client.h"
+#include "imap-login-client.h"
 #include "client-authenticate.h"
 #include "imap-resp-code.h"
 #include "imap-quote.h"