[gnome-keyring: 2/2] Merge remote-tracking branch 'stefw/display-extensions'

[Stefan Walter <stefw src gnome org>]

commit f555936f6cc4de65d1cdb67257836b5fd58b6f3b
Merge: afdd535 65c9d54
Author: Stef Walter <stefw collabora co uk>
Date:   Sat Jun 4 09:37:27 2011 +0000

    Merge remote-tracking branch 'stefw/display-extensions'

 egg/egg-oid.c                    |   31 +++--
 gcr/Makefile.am                  |    1 +
 gcr/gcr-certificate-extensions.c |  269 ++++++++++++++++++++++++++++++++++++++
 gcr/gcr-certificate-extensions.h |   88 +++++++++++++
 gcr/gcr-certificate-renderer.c   |  216 ++++++++++++++++++++++++++++--
 gcr/gcr-display-view.h           |    2 +
 po/POTFILES.in                   |    1 +
 7 files changed, 578 insertions(+), 30 deletions(-)
---
diff --cc gcr/Makefile.am
index 7b67206,f565827..1f50386
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -72,11 -72,10 +72,12 @@@ lib_LTLIBRARIES = libgcr GCR_VERSION_SU
  
  libgcr GCR_VERSION_SUFFIX@_la_SOURCES = \
  	gcr-certificate.c gcr-certificate.h \
 +	gcr-certificate-basics-widget.h gcr-certificate-basics-widget.c \
  	gcr-certificate-chain.c gcr-certificate-chain.h \
 +	gcr-certificate-details-widget.h gcr-certificate-details-widget.c \
  	gcr-certificate-renderer.c gcr-certificate-renderer.h \
  	gcr-certificate-exporter.c gcr-certificate-exporter.h \
+ 	gcr-certificate-extensions.c gcr-certificate-extensions.h \
  	gcr-certificate-widget.c gcr-certificate-widget.h \
  	gcr-collection.c gcr-collection.h \
  	gcr-collection-model.c gcr-collection-model.h \