From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: =?UTF-8?q?Bug=20577929=20=E2=80=93=20Consolidate=20marshallers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- filter/Makefile.am | 10 ++-------- filter/filter-marshal.list | 0 filter/filter-rule.c | 1 - filter/rule-context.c | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 filter/filter-marshal.list (limited to 'filter') diff --git a/filter/Makefile.am b/filter/Makefile.am index 7d4e72daeb..7dc0353ded 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -27,8 +27,6 @@ libfilter_la_SOURCES = \ filter-input.h \ filter-int.c \ filter-int.h \ - filter-marshal.c \ - filter-marshal.h \ filter-option.c \ filter-option.h \ filter-part.c \ @@ -50,16 +48,12 @@ libfilter_la_LIBADD = \ EXTRA_DIST = \ $(glade_DATA) \ filter.error.xml \ - ChangeLog.pre-1-4 \ - filter-marshal.list + ChangeLog.pre-1-4 # basic rules. error_DATA = filter.error errordir = $(privdatadir)/errors @EVO_PLUGIN_RULE@ -MARSHAL_GENERATED = filter-marshal.c filter-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) +BUILT_SOURCES = $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/filter/filter-marshal.list b/filter/filter-marshal.list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 794c94498d..9febe8d0ee 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -33,7 +33,6 @@ #include "e-util/e-error.h" #include "filter-rule.h" #include "rule-context.h" -#include "filter-marshal.h" #define d(x) diff --git a/filter/rule-context.c b/filter/rule-context.c index cc81513784..0a7438b12c 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -48,7 +48,6 @@ #include "filter-file.h" #include "filter-input.h" #include "filter-int.h" -#include "filter-marshal.h" #include "filter-option.h" #include "filter-rule.h" #include "rule-context.h" -- cgit v1.2.3