Rename e-mail-enums.h to e-mail-engine-enums.h.

11 files changed, 21 insertions, 23 deletions

diff --git a/doc/reference/evolution-mail-engine/Makefile.am b/doc/reference/evolution-mail-engine/Makefile.am
index 91b077f4ed..1e8cb5c49e 100644
--- a/doc/reference/evolution-mail-engine/Makefile.am
+++ b/doc/reference/evolution-mail-engine/Makefile.am
@@ -13,7 +13,7 @@ CFILE_GLOB=$(top_srcdir)/libemail-engine/*.c
 
 # Header files to ignore when scanning.
 IGNORE_HFILES= \
-	e-mail-enumtypes.h \
+	e-mail-engine-enumtypes.h \
 	$(NULL)
 
 GTKDOC_CFLAGS= \
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 0cbfaf2e52..68313a2632 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -27,7 +27,7 @@
 #include <gdk/gdk.h>
 #include <glib/gi18n.h>
 
-#include "libemail-engine/e-mail-enumtypes.h"
+#include "libemail-engine/e-mail-engine-enumtypes.h"
 
 #define d(x)
 
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
index 5c9d6ff958..734bcbe8db 100644
--- a/em-format/e-mail-formatter.h
+++ b/em-format/e-mail-formatter.h
@@ -20,7 +20,7 @@
 #define E_MAIL_FORMATTER_H_
 
 #include <gdk/gdk.h>
-#include <libemail-engine/e-mail-enums.h>
+#include <libemail-engine/e-mail-engine-enums.h>
 
 #include <em-format/e-mail-extension-registry.h>
 #include <em-format/e-mail-formatter-enums.h>
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 364e3a8028..f483fb11dc 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -2,20 +2,20 @@ NULL =
 
 privsolib_LTLIBRARIES = libemail-engine.la
 
-ENUM_TYPES = e-mail-enums.h
+ENUM_TYPES = e-mail-engine-enums.h
 
-e-mail-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
+e-mail-engine-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
-		--fhead "#ifndef E_MAIL_ENUMTYPES_H\n#define E_MAIL_ENUMTYPES_H\n" \
-		--ftail "#endif /* E_MAIL_ENUMTYPES_H */\n" \
+		--fhead "#ifndef E_MAIL_ENGINE_ENUMTYPES_H\n#define E_MAIL_ENGINE_ENUMTYPES_H\n" \
+		--ftail "#endif /* E_MAIL_ENGINE_ENUMTYPES_H */\n" \
 		$(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
-e-mail-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
+e-mail-engine-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
-		--fhead "#include \"e-mail-enumtypes.h\"" \
+		--fhead "#include \"e-mail-engine-enumtypes.h\"" \
 		$(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
-ENUM_GENERATED = e-mail-enumtypes.h e-mail-enumtypes.c
+ENUM_GENERATED = e-mail-engine-enumtypes.h e-mail-engine-enumtypes.c
 
 libemail_engine_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
@@ -32,8 +32,8 @@ libmailengineinclude_HEADERS =  \
 	camel-null-store.h \
 	camel-sasl-xoauth2.h \
 	e-mail-authenticator.h \
-	e-mail-enums.h \
-	e-mail-enumtypes.h \
+	e-mail-engine-enums.h \
+	e-mail-engine-enumtypes.h \
 	e-mail-folder-utils.h \
 	e-mail-junk-filter.h \
 	e-mail-session-utils.h \
@@ -56,7 +56,7 @@ libemail_engine_la_SOURCES =  \
 	camel-null-store.c \
 	camel-sasl-xoauth2.c \
 	e-mail-authenticator.c \
-	e-mail-enumtypes.c \
+	e-mail-engine-enumtypes.c \
 	e-mail-folder-utils.c \
 	e-mail-junk-filter.c \
 	e-mail-session-utils.c \
diff --git a/libemail-engine/e-mail-enums.h b/libemail-engine/e-mail-engine-enums.h
index e0ad3ad86f..7232cfaf03 100644
--- a/libemail-engine/e-mail-enums.h
+++ b/libemail-engine/e-mail-engine-enums.h
@@ -1,5 +1,5 @@
 /*
- * e-mail-enums.h
+ * e-mail-engine-enums.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef E_MAIL_ENUMS_H
-#define E_MAIL_ENUMS_H
+#ifndef E_MAIL_ENGINE_ENUMS_H
+#define E_MAIL_ENGINE_ENUMS_H
 
 #include <glib.h>
 
@@ -71,4 +71,4 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* E_MAIL_ENUMS_H */
+#endif /* E_MAIL_ENGINE_ENUMS_H */
diff --git a/libemail-engine/e-mail-session.h b/libemail-engine/e-mail-session.h
index 9445e0b833..de726436ae 100644
--- a/libemail-engine/e-mail-session.h
+++ b/libemail-engine/e-mail-session.h
@@ -27,7 +27,7 @@
 
 #include <camel/camel.h>
 #include <libedataserver/libedataserver.h>
-#include <libemail-engine/e-mail-enums.h>
+#include <libemail-engine/e-mail-engine-enums.h>
 #include <libemail-engine/em-vfolder-context.h>
 #include <libemail-engine/mail-folder-cache.h>
 
diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index afad8cbdd0..971a0eb5c7 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -31,7 +31,7 @@
 
 #include <e-util/e-util.h>
 #include <mail/em-utils.h>
-#include <libemail-engine/e-mail-enumtypes.h>
+#include <libemail-engine/e-mail-engine-enumtypes.h>
 
 #include <string.h>
 
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 24ef087aac..2477e1c286 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -34,7 +34,7 @@
 
 #include "shell/e-shell-utils.h"
 
-#include "libemail-engine/e-mail-enumtypes.h"
+#include "libemail-engine/e-mail-engine-enumtypes.h"
 #include "libemail-engine/e-mail-utils.h"
 #include "libemail-engine/mail-mt.h"
 #include "libemail-engine/mail-ops.h"
diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h
index c73338c987..99e2b22fb6 100644
--- a/mail/e-mail-ui-session.h
+++ b/mail/e-mail-ui-session.h
@@ -29,7 +29,6 @@
 
 #include <camel/camel.h>
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-enums.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/mail-folder-cache.h>
 
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index db7a0c29b3..3f2465daeb 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -28,7 +28,6 @@
 #include <mail/e-mail-backend.h>
 #include <composer/e-msg-composer.h>
 #include <em-format/e-mail-part-list.h>
-#include <libemail-engine/e-mail-enums.h>
 
 G_BEGIN_DECLS
 
diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c
index 902e6bf42f..7050e1e2a6 100644
--- a/modules/settings/e-settings-deprecated.c
+++ b/modules/settings/e-settings-deprecated.c
@@ -24,7 +24,7 @@
 #include "e-settings-deprecated.h"
 
 #include <shell/e-shell.h>
-#include <libemail-engine/e-mail-enums.h>
+#include <libemail-engine/e-mail-engine-enums.h>
 
 #define E_SETTINGS_DEPRECATED_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \