aboutsummaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-23 22:02:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-23 22:02:07 +0800
commite42f27652709397453431b75c32601a4f4effd48 (patch)
tree61373ff6919145f786128d235a7caf05b73c2384 /filter
parent3d6ba7f5bd28cf731ab475c7ff2c809ed681166b (diff)
downloadgsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar.gz
gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar.zst
gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.zip
Bug 577929 – Consolidate marshallers
Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers.
Diffstat (limited to 'filter')
-rw-r--r--filter/Makefile.am10
-rw-r--r--filter/filter-marshal.list0
-rw-r--r--filter/filter-rule.c1
-rw-r--r--filter/rule-context.c1
4 files changed, 2 insertions, 10 deletions
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
--- a/filter/filter-marshal.list
+++ /dev/null
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"