[gnome-keyring: 29/29] Merge branch 'gck-work'

[Stefan Walter <stefw src gnome org>]

commit 58e1cc0cd81ee5abd22303c5bf68a5daf0a134b0
Merge: b1ec84d 83605a4
Author: Stef Walter <stef memberwebs com>
Date:   Fri Oct 1 18:14:27 2010 +0000

    Merge branch 'gck-work'

 Makefile.am                                        |    7 +-
 configure.in                                       |   28 +-
 daemon/Makefile.am                                 |    5 +-
 daemon/control/Makefile.am                         |    3 +-
 daemon/dbus/Makefile.am                            |    3 +-
 daemon/dbus/gkd-dbus-secrets.c                     |   38 +-
 daemon/dbus/gkd-secret-change.c                    |   41 +-
 daemon/dbus/gkd-secret-change.h                    |    4 +-
 daemon/dbus/gkd-secret-create.c                    |   73 +-
 daemon/dbus/gkd-secret-create.h                    |   12 +-
 daemon/dbus/gkd-secret-lock.c                      |   30 +-
 daemon/dbus/gkd-secret-lock.h                      |    4 +-
 daemon/dbus/gkd-secret-objects.c                   |  311 ++--
 daemon/dbus/gkd-secret-objects.h                   |    8 +-
 daemon/dbus/gkd-secret-prompt.c                    |    4 +-
 daemon/dbus/gkd-secret-prompt.h                    |    6 +-
 daemon/dbus/gkd-secret-property.c                  |   56 +-
 daemon/dbus/gkd-secret-property.h                  |   12 +-
 daemon/dbus/gkd-secret-service.c                   |   67 +-
 daemon/dbus/gkd-secret-service.h                   |    6 +-
 daemon/dbus/gkd-secret-session.c                   |  200 +-
 daemon/dbus/gkd-secret-session.h                   |   12 +-
 daemon/dbus/gkd-secret-unlock.c                    |   84 +-
 daemon/dbus/gkd-secret-unlock.h                    |    4 +-
 daemon/gpg-agent/Makefile.am                       |    5 +-
 daemon/gpg-agent/gkd-gpg-agent-ops.c               |  142 +-
 daemon/gpg-agent/gkd-gpg-agent-private.h           |   10 +-
 daemon/gpg-agent/gkd-gpg-agent-standalone.c        |   12 +-
 daemon/gpg-agent/gkd-gpg-agent.c                   |   65 +-
 daemon/login/Makefile.am                           |    5 +-
 daemon/login/gkd-login.c                           |  256 +-
 daemon/login/gkd-login.h                           |    2 +-
 daemon/ssh-agent/Makefile.am                       |    5 +-
 daemon/ssh-agent/gkd-ssh-agent-ops.c               |  546 +++--
 daemon/ssh-agent/gkd-ssh-agent-private.h           |   46 +-
 daemon/ssh-agent/gkd-ssh-agent-proto.c             |  136 +-
 daemon/ssh-agent/gkd-ssh-agent-standalone.c        |   11 +-
 daemon/ssh-agent/gkd-ssh-agent.c                   |   58 +-
 docs/reference/Makefile.am                         |    2 +-
 docs/reference/{gp11 => gck}/.gitignore            |    1 -
 docs/reference/{gp11 => gck}/Makefile.am           |    5 +-
 docs/reference/gck/gck-docs.sgml                   |   25 +
 .../gp11-overrides.txt => gck/gck-overrides.txt}   |    0
 docs/reference/gck/gck-sections.txt                |  195 ++
 docs/reference/gck/gck.types                       |    4 +
 docs/reference/gp11/gp11-docs.sgml                 |   25 -
 docs/reference/gp11/gp11-sections.txt              |  195 --
 docs/reference/gp11/gp11.types                     |    4 -
 egg/Makefile.am                                    |   12 +-
 egg/egg-hex.c                                      |   68 +-
 egg/egg-hex.h                                      |   12 +-
 egg/tests/unit-test-hex.c                          |   32 +-
 gck/.gitignore                                     |    2 +
 gck/Makefile.am                                    |   76 +
 gck/gck-attributes.c                               | 1312 ++++++++++
 gck/gck-call.c                                     |  543 ++++
 gck/gck-enumerator.c                               |  734 ++++++
 gck/gck-marshal.list                               |    3 +
 gck/gck-misc.c                                     |  374 +++
 gck/gck-mock.c                                     | 1785 +++++++++++++
 gck/gck-mock.h                                     |  409 +++
 gck/gck-module.c                                   |  670 +++++
 gck/gck-modules.c                                  |  235 ++
 gck/gck-object.c                                   | 1306 ++++++++++
 gck/gck-private.h                                  |  165 ++
 gck/gck-session.c                                  | 2685 ++++++++++++++++++++
 gck/gck-slot.c                                     | 1081 ++++++++
 gck/gck-test.c                                     |  165 ++
 gck/gck-test.h                                     |   68 +
 gck/gck-uri.c                                      |  350 +++
 gck/gck.h                                          | 1304 ++++++++++
 gck/gck.pc.in                                      |   14 +
 gck/pkcs11.h                                       |   30 +
 gck/tests/Makefile.am                              |   46 +
 gck/tests/gck-test.h                               |   19 +
 gck/tests/mock-test-module.c                       |   10 +
 gck/tests/test-gck-attributes.c                    |  529 ++++
 gck/tests/test-gck-crypto.c                        |  551 ++++
 gck/tests/test-gck-enumerator.c                    |  170 ++
 gck/tests/test-gck-module.c                        |  169 ++
 gck/tests/test-gck-modules.c                       |  145 ++
 gck/tests/test-gck-object.c                        |  363 +++
 gck/tests/test-gck-session.c                       |  246 ++
 gck/tests/test-gck-slot.c                          |  203 ++
 gck/tests/test-gck-uri.c                           |  229 ++
 gcr/Makefile.am                                    |    3 +-
 gcr/gcr-import-dialog.c                            |   36 +-
 gcr/gcr-import-dialog.h                            |    6 +-
 gcr/gcr-importer.c                                 |   86 +-
 gcr/gcr-importer.h                                 |    6 +-
 gcr/gcr-initializer.h                              |    4 +-
 gcr/gcr-internal.h                                 |    2 -
 gcr/gcr-library.c                                  |   19 +-
 gcr/gcr-parser.c                                   |   30 +-
 gcr/gcr-parser.h                                   |    2 +-
 gcr/gcr-types.h                                    |    8 +-
 gcr/tests/Makefile.am                              |    6 +-
 gcr/tests/unit-test-parser.c                       |    4 +-
 pkcs11/Makefile.am                                 |    2 +-
 pkcs11/gkm/gkm-mock.c                              |    5 -
 pkcs11/wrap-layer/gkm-wrap-prompt.h                |    2 +
 po/POTFILES.in                                     |    2 +
 po/fr.po                                           |    1 -
 tool/Makefile.am                                   |    7 +-
 tool/gkr-tool-import.c                             |   29 +-
 ui/gku-prompt.h                                    |    2 -
 106 files changed, 17607 insertions(+), 1543 deletions(-)
---