diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-04-08 18:21:53 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-04-08 18:21:53 +0200 |
| commit | 754dc2fb82903d2f45bebf1837784931bc43b609 (patch) | |
| tree | 9065528f0150b825cffc460530db0888e6c71a33 /gcr/gcr-certificate.h | |
| parent | 59744d50022b332cb0435eef1dc687987fff2acc (diff) | |
| parent | 523ad417fbc175c5543f46c4ad0e4f42699af200 (diff) | |
| download | gcr-754dc2fb82903d2f45bebf1837784931bc43b609.tar.gz | |
Merge branch 'gnome-3-0'
Conflicts:
.gitignore
gcr/gcr-certificate-renderer.c
gcr/gcr-parser.c
gcr/tests/Makefile.am
gcr/tests/frob-key.c
gcr/tests/frob-selector.c
gcr/tests/test-certificate-chain.c
gcr/tests/ui-test-key.c
Diffstat (limited to 'gcr/gcr-certificate.h')
| -rw-r--r-- | gcr/gcr-certificate.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gcr/gcr-certificate.h b/gcr/gcr-certificate.h index 09c74b1..256d9a4 100644 --- a/gcr/gcr-certificate.h +++ b/gcr/gcr-certificate.h @@ -49,6 +49,7 @@ struct _GcrCertificateIface { gconstpointer (*get_der_data) (GcrCertificate *self, gsize *n_data); + /*< private >*/ gpointer dummy1; gpointer dummy2; gpointer dummy3; |