GNOME.org
 

[evolution/email-factory-3-4] Get rid of duplicate and obsolete files.

commit 90ddc54fc7e8def9c23a7bb9f6551ebb0b4d9cd0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jan 18 09:00:40 2012 -0500

    Get rid of duplicate and obsolete files.
    
    Some of the #include's for these files were still pointing to the old
    location in /e-util or /mail.
    
    Also remove e-mail-local.* and e-mail-store.* from libemail-engine.
    These files were obsoleted on the master branch.

 e-util/e-account-utils.c       |  252 -----
 e-util/e-account-utils.h       |   37 -
 e-util/e-signature-list.c      |  498 ---------
 e-util/e-signature-list.h      |   91 --
 e-util/e-signature-utils.c     |  336 ------
 e-util/e-signature-utils.h     |   40 -
 e-util/e-signature.c           |  746 -------------
 e-util/e-signature.h           |   90 --
 libemail-engine/Makefile.am    |   18 +-
 libemail-engine/e-mail-local.c |  154 ---
 libemail-engine/e-mail-local.h |   39 -
 libemail-engine/e-mail-store.c |  490 --------
 libemail-engine/e-mail-store.h |   47 -
 libemail-engine/e-mail-utils.c |    9 +-
 mail/Makefile.am               |   24 +-
 mail/e-mail-account-manager.h  |    2 +-
 mail/e-mail-backend.c          |    1 -
 mail/e-mail-enums.h            |   74 --
 mail/e-mail-folder-utils.c     | 1666 ---------------------------
 mail/e-mail-folder-utils.h     |  164 ---
 mail/e-mail-junk-filter.c      |   82 --
 mail/e-mail-junk-filter.h      |   74 --
 mail/e-mail-reader.c           |   12 +-
 mail/e-mail-session-utils.c    |  930 ----------------
 mail/e-mail-session-utils.h    |   97 --
 mail/e-mail-session.c          | 2414 ----------------------------------------
 mail/e-mail-session.h          |  150 ---
 mail/e-mail-store-utils.c      |  385 -------
 mail/e-mail-store-utils.h      |   74 --
 mail/e-mail-ui-session.h       |    2 +-
 mail/em-composer-utils.h       |    2 +-
 mail/em-format-html.c          |   10 +-
 mail/em-format-html.h          |    2 +-
 mail/mail-config.c             |  295 -----
 mail/mail-config.h             |   49 -
 mail/mail-folder-cache.c       | 1875 -------------------------------
 mail/mail-folder-cache.h       |  144 ---
 mail/mail-ops.c                | 1690 ----------------------------
 mail/mail-ops.h                |   99 --
 mail/mail-tools.c              |  245 ----
 mail/mail-tools.h              |   41 -
 modules/mdn/evolution-mdn.c    |    6 +-
 42 files changed, 40 insertions(+), 13416 deletions(-)
---
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 4448e53..8679677 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -4,6 +4,13 @@ lib_LTLIBRARIES = libemail-engine.la
 AM_CFLAGS = -I$(top_builddir) @GNOME_PLATFORM_CFLAGS@ -Wall -Werror -g3 -O0 -ggdb -DPKGDATADIR="\"$(pkgdatadir)\""
 AM_LDFLAGS = @GNOME_PLATFORM_LIBS@ 
 
+include $(top_srcdir)/glib-gen.mak
+glib_enum_headers=e-mail-enums.h
+glib_enum_output=e-mail-enumtypes
+glib_enum_define=E_MAIL
+glib_enum_prefix=e_mail
+
+ENUM_GENERATED = e-mail-enumtypes.h e-mail-enumtypes.c
 
 libemail_engine_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)	\
@@ -21,6 +28,7 @@ libemail_engine_la_LIBADD = 	\
 libemail_engine_la_LDFLAGS = 
 
 libemail_engine_la_SOURCES = 	\
+		e-mail-enumtypes.c	\
 		e-mail-folder-utils.c	\
 		e-mail-store-utils.c	\
 		mail-tools.c		\
@@ -34,10 +42,11 @@ libemail_engine_la_SOURCES = 	\
 
 libmailengineincludedir = $(privincludedir)/libemail-engine
 libmailengineinclude_HEADERS = 	\
+		e-mail-enums.h		\
+		e-mail-enumtypes.h	\
 		e-mail-session.h	\
 		e-mail-enums.h		\
-		mail-folder-cache.h	\
-		e-mail-local.h		\
+		e-mail-session.c	\
 		e-mail-folder-utils.h	\
 		e-mail-store-utils.h	\
 		mail-tools.h		\
@@ -45,14 +54,13 @@ libmailengineinclude_HEADERS = 	\
 		mail-config.h		\
 		e-mail-session-utils.h	\
 		mail-ops.h		\
-		e-mail-junk-filter.h	\
-		e-mail-store.h
+		e-mail-junk-filter.h
 
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libemail-engine.pc
 
-BUILT_SOURCES = 
+BUILT_SOURCES = $(ENUM_GENERATED)
 
 EXTRA_DIST = 
 CLEANFILES    = $(BUILT_SOURCES)
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 88345e1..48de229 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -44,16 +44,17 @@
 
 #include <gio/gio.h>
 
-#include "libemail-utils/mail-mt.h"
-#include "mail-tools.h"
-#include "e-mail-folder-utils.h"
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-proxy.h>
+
 #include "libemail-utils/e-account-utils.h"
+#include "libemail-utils/mail-mt.h"
 
+#include "e-mail-folder-utils.h"
+#include "e-mail-session.h"
 #include "e-mail-utils.h"
-#include "e-mail-local.h"
+#include "mail-tools.h"
 
 #define d(x)
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 3d4fc61..6aea7f0 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -4,14 +4,6 @@ privsolib_LTLIBRARIES = libevolution-mail.la
 
 mailincludedir = $(privincludedir)/mail
 
-include $(top_srcdir)/glib-gen.mak
-glib_enum_headers=e-mail-enums.h
-glib_enum_output=e-mail-enumtypes
-glib_enum_define=E_MAIL
-glib_enum_prefix=e_mail
-
-ENUM_GENERATED = e-mail-enumtypes.h e-mail-enumtypes.c
-
 libevolution_mail_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)/widgets				\
@@ -55,11 +47,7 @@ mailinclude_HEADERS =					\
 	e-mail-backend.h				\
 	e-mail-browser.h				\
 	e-mail-display.h				\
-	e-mail-enums.h					\
-	e-mail-enumtypes.h				\
 	e-mail-folder-pane.h				\
-	e-mail-folder-utils.h				\
-	e-mail-junk-filter.h				\
 	e-mail-junk-options.h				\
 	e-mail-label-action.h				\
 	e-mail-label-dialog.h				\
@@ -74,7 +62,6 @@ mailinclude_HEADERS =					\
 	e-mail-reader.h					\
 	e-mail-ui-session.h				\
 	e-mail-sidebar.h				\
-	e-mail-store-utils.h				\
 	e-mail-tag-editor.h				\
 	e-mail-view.h					\
 	em-account-editor.h				\
@@ -105,13 +92,9 @@ mailinclude_HEADERS =					\
 	em-vfolder-editor.h				\
 	em-vfolder-rule.h				\
 	mail-autofilter.h				\
-	mail-config.h					\
-	mail-folder-cache.h				\
 	mail-guess-servers.h				\
 	mail-mt.h					\
-	mail-ops.h					\
 	mail-send-recv.h				\
-	mail-tools.h					\
 	mail-vfolder.h					\
 	message-list.h
 
@@ -130,10 +113,7 @@ libevolution_mail_la_SOURCES =				\
 	e-mail-backend.c				\
 	e-mail-browser.c				\
 	e-mail-display.c				\
-	e-mail-enumtypes.c				\
 	e-mail-folder-pane.c				\
-	e-mail-folder-utils.c				\
-	e-mail-junk-filter.c				\
 	e-mail-junk-options.c				\
 	e-mail-label-action.c				\
 	e-mail-label-dialog.c				\
@@ -148,7 +128,6 @@ libevolution_mail_la_SOURCES =				\
 	e-mail-reader.c					\
 	e-mail-ui-session.c				\
 	e-mail-sidebar.c				\
-	e-mail-store-utils.c				\
 	e-mail-tag-editor.c				\
 	e-mail-view.c					\
 	em-account-editor.c				\
@@ -179,7 +158,6 @@ libevolution_mail_la_SOURCES =				\
 	em-vfolder-editor.c				\
 	em-vfolder-rule.c				\
 	mail-autofilter.c				\
-	mail-config.c					\
 	mail-guess-servers.c				\
 	mail-send-recv.c				\
 	mail-vfolder.c					\
@@ -307,7 +285,7 @@ endif
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(error_DATA) $(ENUM_GENERATED)
+BUILT_SOURCES = $(error_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/mail/e-mail-account-manager.h b/mail/e-mail-account-manager.h
index 23f7890..63e52b4 100644
--- a/mail/e-mail-account-manager.h
+++ b/mail/e-mail-account-manager.h
@@ -20,8 +20,8 @@
 #define E_MAIL_ACCOUNT_MANAGER_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-account-utils.h>
 #include <mail/e-mail-account-store.h>
+#include <libemail-utils/e-account-utils.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_ACCOUNT_MANAGER \
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 0bcd4c8..17c5811 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -41,7 +41,6 @@
 #include "shell/e-shell.h"
 
 #include "libemail-engine/e-mail-folder-utils.h"
-#include "libemail-engine/e-mail-local.h"
 #include "mail/e-mail-migrate.h"
 #include "libemail-engine/e-mail-session.h"
 #include "libemail-engine/e-mail-store-utils.h"
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index b263b41..37c92fb 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -32,7 +32,6 @@
 #include <X11/XF86keysym.h>
 #endif
 
-#include "libemail-utils/e-account-utils.h"
 #include "e-util/e-charset.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
@@ -40,10 +39,16 @@
 #include "widgets/misc/e-popup-action.h"
 #include "widgets/misc/e-menu-tool-action.h"
 
+#include "libemail-utils/e-account-utils.h"
+#include "libemail-utils/mail-mt.h"
+
+#include "libemail-engine/mail-ops.h"
+#include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/e-mail-enumtypes.h"
+
 #include "mail/e-mail-backend.h"
 #include "mail/e-mail-browser.h"
 #include "mail/e-mail-display.h"
-#include "mail/e-mail-enumtypes.h"
 #include "mail/e-mail-reader-utils.h"
 #include "mail/e-mail-view.h"
 #include "mail/em-composer-utils.h"
@@ -52,9 +57,6 @@
 #include "mail/em-folder-tree.h"
 #include "mail/em-utils.h"
 #include "mail/mail-autofilter.h"
-#include "libemail-engine/mail-ops.h"
-#include "libemail-engine/e-mail-utils.h"
-#include "libemail-utils/mail-mt.h"
 #include "mail/mail-vfolder.h"
 #include "mail/message-list.h"
 
diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h
index ea54a8d..e8fb9ae 100644
--- a/mail/e-mail-ui-session.h
+++ b/mail/e-mail-ui-session.h
@@ -28,9 +28,9 @@
 #define E_MAIL_UI_SESSION_H
 
 #include <camel/camel.h>
+#include <libemail-engine/e-mail-enums.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/mail-folder-cache.h>
-#include <mail/e-mail-enums.h>
 #include <mail/e-mail-account-store.h>
 #include <e-util/e-activity.h>
 
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 093001d..5b3d3a4 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -26,9 +26,9 @@
 
 #include <em-format/em-format.h>
 #include <mail/e-mail-backend.h>
-#include <mail/e-mail-enums.h>
 #include <mail/e-mail-reader.h>
 #include <composer/e-msg-composer.h>
+#include <libemail-engine/e-mail-enums.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 885dc1b..a720d2c 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -57,13 +57,15 @@
 
 #include <glib/gi18n.h>
 
-#include "e-mail-enumtypes.h"
+#include <libemail-utils/mail-mt.h>
+
+#include <libemail-engine/e-mail-enumtypes.h>
+#include <libemail-engine/e-mail-utils.h>
+#include <libemail-engine/mail-config.h>
+
 #include "em-format-html.h"
 #include "em-html-stream.h"
 #include "em-utils.h"
-#include "libemail-engine/mail-config.h"
-#include "libemail-utils/mail-mt.h"
-#include "libemail-engine/e-mail-utils.h"
 
 #define EM_FORMAT_HTML_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 7ded2e8..954a54e 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -29,9 +29,9 @@
 #define EM_FORMAT_HTML_H
 
 #include <em-format/em-format.h>
-#include <mail/e-mail-enums.h>
 #include <misc/e-web-view.h>
 #include <gtkhtml/gtkhtml-embedded.h>
+#include <libemail-engine/e-mail-enums.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FORMAT_HTML \
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index fa3fd81..d0a1e6d 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -23,13 +23,15 @@
 #include <libebackend/e-extension.h>
 
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-account-utils.h>
+
+#include <libemail-utils/e-account-utils.h>
+
+#include <libemail-engine/e-mail-folder-utils.h>
 
 #include <mail/em-utils.h>
 #include <mail/e-mail-reader.h>
 #include <mail/mail-send-recv.h>
 #include <mail/em-composer-utils.h>
-#include <mail/e-mail-folder-utils.h>
 
 #define MDN_USER_FLAG "receipt-handled"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]