[seahorse: 3/3] Merge branch 'no-gslist'

[Stefan Walter <stefw src gnome org>]

commit e7ad0d5a9bb4aef9df25368b064f0dcf703da10c
Merge: 013f7bc 30b03db
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Aug 12 11:19:12 2011 +0200

    Merge branch 'no-gslist'

 common/seahorse-bind.c                    |   28 +-
 common/seahorse-cleanup.c                 |   22 +-
 libseahorse/seahorse-context.c            |   88 +++---
 libseahorse/seahorse-context.h            |    6 +-
 libseahorse/seahorse-dns-sd.c             |    2 +-
 libseahorse/seahorse-object-model.c       |   14 +-
 libseahorse/seahorse-object-model.h       |    4 +-
 libseahorse/seahorse-operation.c          |   78 +++---
 libseahorse/seahorse-operation.h          |   12 +-
 libseahorse/seahorse-prefs.c              |   47 ++--
 libseahorse/seahorse-servers.c            |   12 +-
 libseahorse/seahorse-servers.h            |    2 +-
 libseahorse/seahorse-source.c             |   20 +-
 libseahorse/seahorse-source.h             |    4 +-
 libseahorse/seahorse-transfer-operation.c |   16 +-
 libseahorse/seahorse-transfer-operation.h |    2 +-
 libseahorse/seahorse-util.c               |  450 +----------------------------
 libseahorse/seahorse-util.h               |   58 +----
 pgp/seahorse-hkp-source.c                 |   30 +-
 pgp/seahorse-ldap-source.c                |  130 ++++----
 pgp/seahorse-pgp-key-properties.c         |   24 +-
 pkcs11/seahorse-pkcs11-module.c           |    1 -
 src/eggtreemultidnd.c                     |   14 +-
 src/seahorse-key-manager-store.c          |    2 +-
 src/seahorse-key-manager.c                |    3 +-
 src/seahorse-keyserver-sync.c             |    6 +-
 src/seahorse-viewer.c                     |    4 +-
 27 files changed, 293 insertions(+), 786 deletions(-)
---
diff --cc pkcs11/seahorse-pkcs11-module.c
index fd127ac,e06f8b6..bbe2f0e
--- a/pkcs11/seahorse-pkcs11-module.c
+++ b/pkcs11/seahorse-pkcs11-module.c
@@@ -33,14 -33,24 +33,13 @@@
  void
  seahorse_pkcs11_module_init (void)
  {
 -	/* TODO: Use modules from p11-kit via gck */
 -#if 0
  	SeahorseSource *source;
 -	GckModule *module;
  	GList *slots, *s;
 -	GError *err = NULL;
 +	GList *modules, *m;
  
 -	for (l = module_paths; l; l = g_list_next (l)) {
 -
 -		module = gck_module_initialize (l->data, &err);
 -		if (!module) {
 -			g_warning ("couldn't initialize %s pkcs11 module: %s",
 -			           (gchar*)l->data, err ? err->message : NULL);
 -			g_clear_error (&err);
 -			continue;
 -		}
 -
 -		slots = gck_module_get_slots (module, FALSE);
 +	modules = gck_modules_initialize_registered ();
- 
 +	for (m = modules; m != NULL; m = g_list_next (m)) {
 +		slots = gck_module_get_slots (m->data, FALSE);
  		for (s = slots; s; s = g_list_next (s)) {
  			source = SEAHORSE_SOURCE (seahorse_pkcs11_source_new (s->data));
  			seahorse_context_take_source (NULL, source);