diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-18 11:31:42 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-18 11:31:42 +0800 |
| commit | 979203663083ef89f678dc1e95bc0c9b24f55a9e (patch) | |
| tree | 6fbdcf5e78079607eb176059c900c16ea5ce438f /smime | |
| parent | 8d21ab98d99ca43ee7873adba8172b699d8a007f (diff) | |
| download | gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.gz gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.zst gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.zip | |
Progress update:
- Kill EABMenu.
- Centralize marshallers to eliminate duplication.
svn path=/branches/kill-bonobo/; revision=36368
Diffstat (limited to 'smime')
| -rw-r--r-- | smime/lib/Makefile.am | 7 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 7 | ||||
| -rw-r--r-- | smime/lib/smime-marshal.list | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index df055929dd..2b9e74d3bf 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 \ @@ -34,10 +33,4 @@ libessmime_la_LIBADD = \ 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 1c879177f1..c00c3fe26b 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -71,7 +71,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" @@ -334,7 +333,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); @@ -344,7 +343,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); @@ -354,7 +353,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 |