diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-23 22:02:07 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-23 22:02:07 +0800 |
| commit | e42f27652709397453431b75c32601a4f4effd48 (patch) | |
| tree | 61373ff6919145f786128d235a7caf05b73c2384 /smime | |
| parent | 3d6ba7f5bd28cf731ab475c7ff2c809ed681166b (diff) | |
| download | gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar.gz gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar.bz2 gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar.lz gsoc2013-evolution-e42f27652709397453431b75c32601a4f4effd48.tar.xz 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 'smime')
| -rw-r--r-- | smime/lib/Makefile.am | 9 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 7 | ||||
| -rw-r--r-- | smime/lib/smime-marshal.list | 3 |
3 files changed, 3 insertions, 16 deletions
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index df055929dd..52ad228baa 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -16,7 +16,6 @@ INCLUDES = \ privsolib_LTLIBRARIES = libessmime.la libessmime_la_SOURCES = \ - $(MARSHAL_GENERATED) \ e-asn1-object.c \ e-asn1-object.h \ e-cert.c \ @@ -33,11 +32,3 @@ libessmime_la_LIBADD = \ $(CERT_UI_LIBS) libessmime_la_LDFLAGS = $(NO_UNDEFINED) - -MARSHAL_GENERATED = smime-marshal.c smime-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = smime-marshal.list diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index ed25356bd4..73bfc72131 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -53,7 +53,6 @@ #define CERT_NewTempCertificate __CERT_NewTempCertificate #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm -#include "smime-marshal.h" #include "e-cert-db.h" #include "e-cert-trust.h" #include "e-pkcs12.h" @@ -316,7 +315,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, pk11_passwd), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER, + e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_POINTER); @@ -326,7 +325,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, pk11_change_passwd), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_POINTER, + e_marshal_BOOLEAN__POINTER_POINTER, G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_POINTER); @@ -336,7 +335,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, confirm_ca_cert_import), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER, + e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER, G_TYPE_BOOLEAN, 4, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); } diff --git a/smime/lib/smime-marshal.list b/smime/lib/smime-marshal.list deleted file mode 100644 index 6eb2617ec0..0000000000 --- a/smime/lib/smime-marshal.list +++ /dev/null @@ -1,3 +0,0 @@ -BOOL:POINTER,BOOL,POINTER -BOOL:POINTER,POINTER -BOOL:POINTER,POINTER,POINTER,POINTER |