From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 15 Jan 2016 14:49:05 +0000 (+0200)
Subject: imap-login: Renamed client.[ch] to imap-login-client.[ch]
X-Git-Tag: 2.2.22.rc1~351
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0af9ef2e9bb71a426bba236e74ceec30be699fb7;p=thirdparty%2Fdovecot%2Fcore.git

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 0f5d3116ef..a3f5d27d6f 100644
--- 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 47fcf168a9..829ad4a495 100644
--- 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 7b833e1f75..b1a6d67a7a 100644
--- 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 b622749a49..2a38949c6e 100644
--- 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 527d6a030e..3b02cb3f93 100644
--- 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"