[gnome-keyring: 6/6] Merge branch 'key-fingerprints'

[Stefan Walter <stefw src gnome org>]

commit 8510dcb39aeeb9e4b7230da4401f24f1bd64d614
Merge: 40fb2e4 0f84906
Author: Stef Walter <stefw collabora co uk>
Date:   Tue May 24 09:37:21 2011 +0200

    Merge branch 'key-fingerprints'
    
    Conflicts:
    	gcr/Makefile.am

 .gitignore                      |    1 +
 egg/egg-asn1x.c                 |   17 +++-
 egg/egg-asn1x.h                 |    4 +-
 egg/pk.asn                      |    2 +
 egg/tests/test-asn1.c           |   25 ++++
 egg/tests/test.asn              |    2 +
 gcr/Makefile.am                 |    3 +-
 gcr/gcr-certificate-renderer.c  |   19 ++-
 gcr/gcr-fingerprint.c           |  266 +++++++++++++++++++++++++++++++++++++++
 gcr/gcr-fingerprint.h           |   40 ++++++
 gcr/gcr-key-renderer.c          |   20 +++-
 gcr/gcr-key-widget.c            |   13 +--
 gcr/tests/Makefile.am           |    1 +
 gcr/tests/files/client.crt      |  Bin 0 -> 736 bytes
 gcr/tests/files/client.key      |   27 ++++
 gcr/tests/files/client.pem      |   18 +++
 gcr/tests/files/generic-dsa.crt |  Bin 0 -> 918 bytes
 gcr/tests/files/generic-dsa.key |   12 ++
 gcr/tests/files/generic-dsa.pem |   22 ++++
 gcr/tests/test-fingerprint.c    |  181 ++++++++++++++++++++++++++
 20 files changed, 651 insertions(+), 22 deletions(-)
---
diff --cc gcr/Makefile.am
index fd30628,16ac5dc..8ccc601
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -78,10 -77,10 +78,10 @@@ libgcr GCR_VERSION_SUFFIX@_la_SOURCES 
  	gcr-certificate-widget.c gcr-certificate-widget.h \
  	gcr-collection.c gcr-collection.h \
  	gcr-collection-model.c gcr-collection-model.h \
 -	gcr-colons.c gcr-colons.h \
 +	gcr-combo-selector.c gcr-combo-selector.h \
+ 	gcr-comparable.c gcr-comparable.h \
  	gcr-debug.c gcr-debug.h \
  	gcr-display-scrolled.c gcr-display-scrolled.h \
- 	gcr-comparable.c gcr-comparable.h \
  	gcr-display-view.c gcr-display-view.h \
  	gcr-gnupg-collection.c gcr-gnupg-collection.h \
  	gcr-gnupg-key.c gcr-gnupg-key.h \