[gnome-keyring: 6/6] Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

commit e4faefb8ed07f6e6fa220c96c4591bc7b5f004e7
Merge: c0dc972 0005213
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Apr 18 13:36:01 2011 +0200

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	docs/reference/gcr/gcr-sections.txt
    	gcr/Makefile.am
    	gcr/gcr-library.c

 .gitignore                                         |   13 +
 docs/reference/gcr/gcr-sections.txt                |    2 +
 egg/egg-openssl.c                                  |    8 +-
 egg/egg-openssl.h                                  |    2 +-
 gcr/Makefile.am                                    |    1 +
 gcr/gcr-certificate-chain.c                        |   46 ++-
 gcr/gcr-debug.c                                    |  106 +++++
 gcr/gcr-debug.h                                    |   86 ++++
 gcr/gcr-library.c                                  |    4 +
 gcr/tests/frob-certificate.c                       |    1 +
 gcr/tests/frob-key.c                               |    1 +
 gcr/tests/frob-unlock-options.c                    |    1 +
 gcr/tests/test-certificate-chain.c                 |    1 +
 gcr/tests/test-certificate.c                       |    1 +
 gcr/tests/test-parser.c                            |    1 +
 gcr/tests/test-pkcs11-certificate.c                |    1 +
 gcr/tests/test-simple-certificate.c                |    1 +
 gcr/tests/test-trust.c                             |    1 +
 pkcs11/gkm/gkm-data-der.c                          |   58 ++--
 pkcs11/gkm/gkm-data-der.h                          |   58 ++--
 pkcs11/gkm/tests/Makefile.am                       |   94 +++-
 .../tests/{test-data => files}/ca-certificates.crt |    0
 .../{test-data => files}/der-pkcs8-PBE-MD5-DES.key |  Bin 677 -> 677 bytes
 .../der-pkcs8-PBE-SHA1-3DES.key                    |  Bin 678 -> 678 bytes
 .../der-pkcs8-PBE-SHA1-DES.key                     |  Bin 677 -> 677 bytes
 .../der-pkcs8-PBE-SHA1-RC2-40.key                  |  Bin 678 -> 678 bytes
 .../der-pkcs8-PBE-SHA1-RC4-128.key                 |  Bin 673 -> 673 bytes
 .../tests/{test-data => files}/der-pkcs8-dsa.key   |  Bin 335 -> 335 bytes
 .../der-pkcs8-encrypted-pkcs5.key                  |  Bin 677 -> 677 bytes
 .../{test-data => files}/der-pkcs8-v2-des.key      |  Bin 711 -> 711 bytes
 .../{test-data => files}/der-pkcs8-v2-des3.key     |  Bin 714 -> 714 bytes
 .../gkm/tests/{test-data => files}/der-pkcs8.key   |  Bin 635 -> 635 bytes
 .../gkm/tests/{test-data => files}/pem-rsa-enc.key |    0
 .../{test-data => files}/test-certificate-1.der    |  Bin 813 -> 813 bytes
 .../{test-data => files}/test-certificate-2.der    |  Bin 1346 -> 1346 bytes
 pkcs11/gkm/tests/mock-locked-object.h              |    4 +-
 pkcs11/gkm/tests/{test-module.c => mock-module.c}  |   36 +-
 pkcs11/gkm/tests/{test-module.h => mock-module.h}  |   22 +-
 .../{unit-test-attributes.c => test-attributes.c}  |  260 ++++++++---
 .../{unit-test-credential.c => test-credential.c}  |  123 +++--
 .../{unit-test-data-asn1.c => test-data-asn1.c}    |   46 ++-
 .../{unit-test-data-der.c => test-data-der.c}      |  167 +++++---
 pkcs11/gkm/tests/test-file-tracker.c               |  244 ++++++++++
 pkcs11/gkm/tests/test-memory-store.c               |  482 ++++++++++++++++++++
 .../tests/{unit-test-object.c => test-object.c}    |  132 ++++---
 .../tests/{unit-test-secret.c => test-secret.c}    |   48 ++-
 pkcs11/gkm/tests/{unit-test-sexp.c => test-sexp.c} |   64 ++-
 .../gkm/tests/{unit-test-store.c => test-store.c}  |   59 ++-
 pkcs11/gkm/tests/test-timer.c                      |  175 +++++++
 ...{unit-test-transaction.c => test-transaction.c} |  117 ++++--
 pkcs11/gkm/tests/unit-test-file-tracker.c          |  221 ---------
 pkcs11/gkm/tests/unit-test-memory-store.c          |  438 ------------------
 pkcs11/gkm/tests/unit-test-timer.c                 |  144 ------
 53 files changed, 2027 insertions(+), 1242 deletions(-)
---
diff --cc gcr/Makefile.am
index e55df6c,e68e550..532462c
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -61,12 -68,9 +61,13 @@@ LIB_SOURCES = 
  	gcr-certificate.c gcr-certificate.h \
  	gcr-certificate-chain.c gcr-certificate-chain.h \
  	gcr-certificate-renderer.c gcr-certificate-renderer.h \
 +	gcr-certificate-exporter.c gcr-certificate-exporter.h \
  	gcr-certificate-widget.c gcr-certificate-widget.h \
 +	gcr-collection.c gcr-collection.h \
 +	gcr-collection-model.c gcr-collection-model.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-icons.c gcr-icons.h \
  	gcr-import-dialog.c gcr-import-dialog.h \
diff --cc gcr/gcr-library.c
index 3676558,0f338ed..c52ba38
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@@ -21,12 -21,11 +21,14 @@@
  
  #include "config.h"
  
 -#include "gcr-types.h"
 +#include "gcr.h"
 +#include "gcr-certificate-renderer.h"
+ #define DEBUG_FLAG GCR_DEBUG_LIBRARY
+ #include "gcr-debug.h"
  #include "gcr-internal.h"
  #include "gcr-library.h"
 +#include "gcr-key-renderer.h"
 +#include "gcr-types.h"
  
  #include "egg/egg-error.h"
  #include "egg/egg-libgcrypt.h"
@@@ -180,8 -179,7 +182,10 @@@ _gcr_initialize (void
  		g_once_init_leave (&gcr_initialized, 1);
  	}
  
 +	g_type_class_unref (g_type_class_ref (GCR_TYPE_CERTIFICATE_RENDERER));
 +	g_type_class_unref (g_type_class_ref (GCR_TYPE_KEY_RENDERER));
++
+ 	_gcr_debug ("initialized library");
  }
  
  /**