commit 456041b6cac4c0677b1583cc80a3e1b3a1657398
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-25

    Release version 3.1.4
    
     * Include some changes to make comparing symbols easier.
     * Fix some issues that came up when doing make distcheck

 .gitignore                 |    1 +
 NEWS                       |   11 +++
 configure.ac               |    2 +-
 gck/Makefile.am            |    6 ++
 gcr/Makefile.am            |   18 +++--
 gcr/libgcr.symbols         |  183 --------------------------------------------
 gcr/tests/test-gnupg-key.c |    2 +-
 7 files changed, 30 insertions(+), 193 deletions(-)

commit feae041c4d96a4579a5c3189013eac1b509d1261
Author: Ross Burton <ross@linux.intel.com>
Date:   2011-07-19

    gcr: install the enum headers
    
    https://bugzilla.gnome.org/show_bug.cgi?id=654896

 gcr/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 79c5168b60829af778ee32dd37c65a0a51cf7687
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:   2011-07-19

    Updated Persian translations

 po/fa.po | 1258 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 545 insertions(+), 713 deletions(-)

commit e701de2b59e03a99493f890143a46b103df022e7
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-18

    gck: Fix PKCS#11 URI documentation.

 gck/gck-uri.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

commit 551843b52009417d2a46739fc275d0ab329ea0de
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-18

    gcr: Use glib-mkenums to generate types for enums and flags
    
     * And remove manually coded type registration in GcrCertificateChain

 .gitignore                          |    2 +-
 configure.ac                        |    1 +
 docs/reference/gcr/gcr-sections.txt |    9 +++++++
 gcr/Makefile.am                     |   17 +++++++++++---
 gcr/gcr-certificate-chain.c         |   41 -----------------------------------
 gcr/gcr-certificate-chain.h         |   20 +---------------
 gcr/gcr-enum-types.c.template       |   35 +++++++++++++++++++++++++++++
 gcr/gcr-enum-types.h.template       |   28 +++++++++++++++++++++++
 gcr/gcr.h                           |    2 +
 9 files changed, 91 insertions(+), 64 deletions(-)

commit a69bdf20715703de9c1a1d283137d9f19d6bb419
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-18

    Cleanup doc sections a bit.

 docs/reference/gcr/gcr-sections.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit d739f96614965c76cab67d1f5d25f25b1f4764ef
Merge: f2bfa48 73f773b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-18

    Merge branch 'list-selector'

commit f2bfa4832d17bae6d2d53d2ba1d953a84fe4290f
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   2011-07-15

    Updated Hebrew translation.

 po/he.po |  619 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 278 insertions(+), 341 deletions(-)

commit 8e949277c8255fc4f02a389e02026283c10f941f
Author: Mario Blättermann <mariobl@gnome.org>
Date:   2011-07-14

    [l10n] Updated German translation

 po/de.po | 1014 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 579 insertions(+), 435 deletions(-)

commit 4e30ec8bf2de8d633811fb65cb14ef10f49db2d9
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   2011-07-14

    Updated Slovenian translation

 po/sl.po |  623 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 279 insertions(+), 344 deletions(-)

commit 92124ddf8bebeb1d31506627d8c8015847068b8f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-13

    gcr: Better markup for PGP keys.

 gcr/gcr-gnupg-key.c |  107 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 100 insertions(+), 7 deletions(-)

commit 73f773ba26bf25b27886885b30f41d3c7820959f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-12

    gcr: Document GcrListSelector

 docs/reference/gcr/Makefile.am              |    7 +++-
 docs/reference/gcr/gcr-docs.sgml            |    1 +
 docs/reference/gcr/gcr-sections.txt         |   20 ++++++++++++++
 docs/reference/gcr/gcr-visual-index.xml     |    3 ++
 docs/reference/gcr/gcr-widgets.c            |   39 +++++++++++++++++++++++++++
 docs/reference/gcr/images/list-selector.png |  Bin 0 -> 10123 bytes
 gcr/gcr-list-selector.c                     |    8 +++--
 7 files changed, 73 insertions(+), 5 deletions(-)

commit cfb39360f9f6316f01ce963e5c66ae1f9c8cb111
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-12

    gcr: Add the list selector and live search.
    
     * Use live search from Empathy.
     * Selector has [x] boxes next to each object.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=654484

 gcr/Makefile.am                 |    3 +
 gcr/gcr-list-selector-private.h |   40 +++
 gcr/gcr-list-selector.c         |  456 +++++++++++++++++++++++++++
 gcr/gcr-list-selector.h         |   73 +++++
 gcr/gcr-live-search.c           |  651 +++++++++++++++++++++++++++++++++++++++
 gcr/gcr-live-search.h           |   85 +++++
 gcr/gcr-marshal.list            |    1 +
 gcr/gcr.h                       |    1 +
 gcr/tests/frob-gnupg-selector.c |   18 +-
 9 files changed, 1324 insertions(+), 4 deletions(-)

commit c03d3260eeb5ed9c6d7ca531f970d4df8c7b15ec
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-13

    gcr: Better markup for PGP keys.

 gcr/gcr-gnupg-key.c |  104 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 97 insertions(+), 7 deletions(-)

commit f64341b5da3e03495ed1019a0164dc0dacacef53
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-13

    Fix some distcheck problems

 gcr/tests/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit cc8184c4f66ce7f2a8a2d4e2474708590c2b3e6f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-13

    gcr: Update doc images
    
     * And fix some issues with building shooter executable

 docs/reference/gcr/Makefile.am                   |    6 +++---
 docs/reference/gcr/gcr-shooter.c                 |    6 +-----
 docs/reference/gcr/images/certificate-widget.png |  Bin 17514 -> 15090 bytes
 docs/reference/gcr/images/combo-selector.png     |  Bin 7855 -> 7065 bytes
 docs/reference/gcr/images/key-widget.png         |  Bin 8311 -> 10159 bytes
 docs/reference/gcr/images/tree-selector.png      |  Bin 11930 -> 10628 bytes
 6 files changed, 4 insertions(+), 8 deletions(-)

commit cbce2b1d248899d46609e11c5c04533ca58a74cc
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-13

    gcr: Add icons for key and keypair
    
    https://bugzilla.gnome.org/show_bug.cgi?id=651862

 configure.ac                     |    6 +
 gcr/Makefile.am                  |    2 +-
 gcr/gcr-gnupg-key.c              |    8 +-
 gcr/gcr-icons.c                  |    3 +-
 gcr/gcr-icons.h                  |    3 +-
 gcr/gcr-key-renderer.c           |    2 +-
 gcr/icons/16x16/Makefile.am      |   10 +
 gcr/icons/16x16/gcr-key-pair.png |  Bin 0 -> 878 bytes
 gcr/icons/16x16/gcr-key.png      |  Bin 0 -> 675 bytes
 gcr/icons/22x22/Makefile.am      |    8 +
 gcr/icons/24x24/Makefile.am      |   10 +
 gcr/icons/24x24/gcr-key-pair.png |  Bin 0 -> 1221 bytes
 gcr/icons/24x24/gcr-key.png      |  Bin 0 -> 875 bytes
 gcr/icons/32x32/Makefile.am      |   10 +
 gcr/icons/32x32/gcr-key-pair.png |  Bin 0 -> 1882 bytes
 gcr/icons/32x32/gcr-key.png      |  Bin 0 -> 1201 bytes
 gcr/icons/48x48/Makefile.am      |   10 +
 gcr/icons/48x48/gcr-key-pair.png |  Bin 0 -> 3480 bytes
 gcr/icons/48x48/gcr-key.png      |  Bin 0 -> 2087 bytes
 gcr/icons/Makefile.am            |   13 +
 gcr/icons/key-and-keypair.svg    | 3921 ++++++++++++++++++++++++++++++++++++++
 21 files changed, 4000 insertions(+), 6 deletions(-)

commit 42999a5cabd59db3f171c47217e90637954e7b32
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-07-13

    Updated Spanish translation

 po/es.po |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

commit de0f65b1d8ec04a4c8d3589dd588cc8a1fade4f0
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:   2011-07-12

    Updated Latvian translation.

 po/lv.po | 1096 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 619 insertions(+), 477 deletions(-)

commit 974f8b2767b7238a5a568117dcdb588a3f158fa7
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-07-12

    Add missing file

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit cdd3ef6a0d703c0349665252c7732aa8a2ebfc94
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-07-12

    Updated Norwegian bokmål translation

 po/nb.po |  379 ++++++-------------------------------------------------------
 1 files changed, 38 insertions(+), 341 deletions(-)

commit 7f2f8f33ee6316015661c0668fe3f63493a6e14b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-12

    gcr: Review fixes for gnupg icon support
    
     * Reviewed by Phillip Withnall
     * Memory leak fixes.
     * Documentation
     * Other minor bits.

 gcr/gcr-gnupg-collection.c        |    5 ++++
 gcr/gcr-gnupg-key.c               |   38 ++++++++++++++++++++++++++++--------
 gcr/gcr-gnupg-util.c              |   12 +++++++++++
 gcr/gcr-memory-icon.c             |   34 +++++++++++++++++++++++++++++++-
 gcr/gcr-memory-icon.h             |    2 +-
 gcr/gcr-record.c                  |   10 +++++++++
 gcr/tests/test-gnupg-collection.c |    5 ++++
 gcr/tests/test-memory-icon.c      |    2 +-
 8 files changed, 95 insertions(+), 13 deletions(-)

commit 9938f392505415b5d8c622424a9c57e492c43298
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-13

    gcr: Display photo as icon for Gnupg keys.
    
     * Load the first photo uid and use as icon for Gnupg Keys.
     * Add GcrMemoryIcon which is a GLoadableIcon which loads from
       data in memory.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650433

 .gitignore                          |    1 +
 docs/reference/gcr/gcr-sections.txt |   10 ++
 gcr/Makefile.am                     |    1 +
 gcr/gcr-gnupg-key.c                 |   85 ++++++++++++++-
 gcr/gcr-gnupg-key.h                 |    2 +
 gcr/gcr-memory-icon.c               |  195 +++++++++++++++++++++++++++++++++
 gcr/gcr-memory-icon.h               |   67 +++++++++++
 gcr/gcr-record.c                    |   14 +++
 gcr/gcr-record.h                    |    4 +
 gcr/tests/Makefile.am               |    1 +
 gcr/tests/test-memory-icon.c        |  206 +++++++++++++++++++++++++++++++++++
 gcr/tests/test-record.c             |   18 +++-
 12 files changed, 599 insertions(+), 5 deletions(-)

commit dac5daa5fbe0013a712ecfd241800f1242920e27
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-12

    gcr: Implement loading of attributes in GcrGnupgCollection
    
     * These attributes can contain photo ids.
     * Add various definitions for dealing with attributes.
     * Since we like everything in the --with-colons gnupg format,
       we implement our own record type 'xa1' and cram the attribute
       (photo id) into there, along with all data.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650433

 docs/reference/gcr/gcr-sections.txt |    6 ++
 gcr/Makefile.am                     |    1 +
 gcr/gcr-gnupg-collection.c          |  161 ++++++++++++++++++++++++++++++++---
 gcr/gcr-gnupg-key.c                 |   11 +++
 gcr/gcr-gnupg-key.h                 |    2 +
 gcr/gcr-gnupg-util.c                |  102 ++++++++++++++++++++++
 gcr/gcr-gnupg-util.h                |   41 +++++++++
 gcr/gcr-record.h                    |   43 +++++++++-
 gcr/tests/test-gnupg-collection.c   |   45 +++++++++--
 9 files changed, 393 insertions(+), 19 deletions(-)

commit 73e11d9b3bc2680b90ec8ab1c10bcc7ba8524f50
Merge: 20b7ec0 e2ca61d
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-12

    Merge branch 'gnupg-process'

commit e2ca61d312291a71075a1c30d7dbb3826ce0d16d
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-12

    gcr: Review changes for GcrGnupgProcess from Phillip Withnall
    
     * Better docs
     * Disconnect signal handlers properly.
     * Cleanup tests.
     * Other bits

 gcr/gcr-gnupg-collection.c                         |   26 +++--
 gcr/gcr-gnupg-process.c                            |   85 ++++++++++++---
 gcr/gcr-gnupg-process.h                            |    3 +-
 .../files/gnupg-mock/mock-status-and-attribute     |    2 +-
 gcr/tests/test-gnupg-process.c                     |  117 +++++++++++++++++---
 5 files changed, 193 insertions(+), 40 deletions(-)

commit 9a9fa2d72cc7ee1f661b101c522ae23c12a15305
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-12

    gcr: Refactor gnupg process execution into its own class.
    
     * Support getting user attribute data from keyring.
     * Support getting status messages from gpg.
     * Better cancellation api.
     * Control over LOCALE
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650336

 .gitignore                                         |    1 +
 docs/reference/gcr/gcr-sections.txt                |   12 +-
 gcr/Makefile.am                                    |    1 +
 gcr/gcr-gnupg-collection.c                         |  156 ++---
 gcr/gcr-gnupg-collection.h                         |   10 +-
 gcr/gcr-gnupg-process.c                            |  866 ++++++++++++++++++++
 gcr/gcr-gnupg-process.h                            |   88 ++
 gcr/gcr-marshal.list                               |    2 +
 gcr/tests/Makefile.am                              |    3 +-
 gcr/tests/files/gnupg-mock/mock-arguments-environ  |   22 +
 gcr/tests/files/gnupg-mock/mock-fail-exit          |    6 +
 gcr/tests/files/gnupg-mock/mock-fail-signal        |    8 +
 gcr/tests/files/gnupg-mock/mock-simple-error       |    9 +
 gcr/tests/files/gnupg-mock/mock-simple-output      |    8 +
 .../files/gnupg-mock/mock-status-and-attribute     |   34 +
 gcr/tests/files/gnupg-mock/mock-status-and-output  |   24 +
 gcr/tests/files/gnupg-mock/mock-with-homedir       |   22 +
 gcr/tests/test-gnupg-collection.c                  |    1 -
 gcr/tests/test-gnupg-process.c                     |  446 ++++++++++
 19 files changed, 1609 insertions(+), 110 deletions(-)

commit 20b7ec068267b8c20de7cf3713c01522fddf050e
Author: A S Alam <aalam@users.sf.net>
Date:   2011-07-10

    update Punjabi Translation

 po/pa.po | 1216 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 699 insertions(+), 517 deletions(-)

commit d29adebcc8f069d65bb26adac7fa2a4f0b5695c8
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:   2011-07-10

    [l10n]Updated Turkish translation

 po/tr.po | 2345 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1332 insertions(+), 1013 deletions(-)

commit 707caf81303cd7c367516be62bc0277c5f22b5f6
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-07-10

    Updated Spanish translation

 po/es.po |  620 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 266 insertions(+), 354 deletions(-)

commit 70199ca9eb7d3ee70a3272fe9cfc561a9e200b59
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-09

    gcr: Fixes for the gcr-3.pc file
    
     * Proper Name: field
     * Fix GTK dependency

 gcr/gcr.pc.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 0f5caa9eae67353eb0c640ce1007d65e3f8c51ea
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-09

    gck: Dump major version number due to recent API refactoring.
    
     * API is not yet stable, but we increase the major version so that we
       don't piss off packagers.

 configure.ac                   |    2 +-
 daemon/Makefile.am             |    2 +-
 daemon/gpg-agent/Makefile.am   |    2 +-
 daemon/login/Makefile.am       |    2 +-
 daemon/ssh-agent/Makefile.am   |    2 +-
 docs/reference/gcr/Makefile.am |    2 +-
 gck/Makefile.am                |   15 +++++++------
 gck/gck.pc.in                  |    6 ++--
 gcr/Makefile.am                |    2 +-
 gcr/libgcr.symbols             |   46 +++++++++++++++++++++++++++++++++++++++-
 pkcs11/Makefile.am             |    2 +-
 tool/Makefile.am               |    2 +-
 ui/Makefile.am                 |    2 +-
 13 files changed, 66 insertions(+), 21 deletions(-)

commit 36b62bbad78bced6da5545000e4d73f376d7b8f5
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-08

    More build fixes after recent changes.
    
     * Use proper library names for gcr
     * Use lib64 properly for pam modules when default is configured.

 configure.ac    |    2 +-
 gcr/Makefile.am |    4 ++--
 gcr/gcr.pc.in   |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 176924344174f1510c3b5caa52399170d225acfc
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-13

    Remove support for GTK+2.
    
     * Simplifies things going forward. Now that GTK+3 is in stable distros
       we can depend on it.
     * This was raised on the mailing list a while back.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650144

 configure.ac                   |   36 +------------------------
 docs/reference/gcr/Makefile.am |    2 +-
 gcr/Makefile.am                |   20 +++++++-------
 gcr/gcr-display-scrolled.c     |    6 ----
 gcr/gcr-display-view.c         |   56 ----------------------------------------
 tool/Makefile.am               |   16 +++++------
 ui/Makefile.am                 |   20 ++++++--------
 ui/gku-prompt-tool.c           |   24 -----------------
 8 files changed, 29 insertions(+), 151 deletions(-)

commit e1e311edaa7c153e9d20ef21c6ce4851b9ee2715
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-06

    gck: Update GckUriFlags to match p11-kit

 gck/gck-modules.c        |    6 +++-
 gck/gck-uri.c            |   21 ++++++++++++------
 gck/gck.h                |   18 ++++++++++++---
 gck/tests/test-gck-uri.c |   52 +++++++++++++++++++++++-----------------------
 4 files changed, 58 insertions(+), 39 deletions(-)

commit 59b08405aedb9fdfad4e7d6d613a667357f2aa8f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-06-07

    Properly load directory to install p11-kit config to.

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1d22919750fba04c967ce3df9a5a646d7dba1a68
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-05

    Use p11-kit to lookup trust uris.

 gcr/Makefile.am                          |    1 +
 gcr/gcr-library.c                        |   38 +++++++++++++++++++++--------
 pkcs11/rpc-layer/gnome-keyring-module.in |    4 +++
 3 files changed, 32 insertions(+), 11 deletions(-)

commit c509fbddecb86b61e58943c22a7bddc42ccca229
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-05

    Install a proper p11-kit module configuration file

 .gitignore                               |    6 ++++--
 configure.ac                             |   15 +++++++++++++--
 pkcs11/rpc-layer/Makefile.am             |    7 +++++++
 pkcs11/rpc-layer/gnome-keyring-module.in |    4 ++++
 4 files changed, 28 insertions(+), 4 deletions(-)

commit de7b628ac6e501b200500e42a6d1f169915e2779
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-05

    Remove extraneous argument from gck_module_new and gck_module_initialize
    
     * Since the signature of these functions changed anyway (API not yet
       stable, we are going to clean them up a bit more.
     * The xxx_full versions may be needed in the future if more options
       show up.

 daemon/dbus/gkd-dbus-secrets.c              |    2 +-
 daemon/gpg-agent/gkd-gpg-agent-standalone.c |    2 +-
 daemon/gpg-agent/gkd-gpg-agent.c            |    2 +-
 daemon/login/gkd-login.c                    |    2 +-
 daemon/ssh-agent/gkd-ssh-agent-standalone.c |    2 +-
 daemon/ssh-agent/gkd-ssh-agent.c            |    2 +-
 gck/gck-module.c                            |   10 ++++------
 gck/gck-modules.c                           |    5 ++---
 gck/gck-private.h                           |    3 +--
 gck/gck.h                                   |    6 ++----
 gck/tests/test-gck-crypto.c                 |    2 +-
 gck/tests/test-gck-enumerator.c             |    2 +-
 gck/tests/test-gck-module.c                 |    8 ++++----
 gck/tests/test-gck-modules.c                |    2 +-
 gck/tests/test-gck-object.c                 |    2 +-
 gck/tests/test-gck-session.c                |    2 +-
 gck/tests/test-gck-slot.c                   |    4 ++--
 gcr/gcr-library.c                           |    4 ++--
 gcr/tests/test-certificate-chain.c          |    2 +-
 gcr/tests/test-pkcs11-certificate.c         |    2 +-
 gcr/tests/test-trust.c                      |    2 +-
 21 files changed, 31 insertions(+), 37 deletions(-)

commit dc463d6f93dcfc8f6b11bb8385c76735df31f333
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-02-21

    gck: Use p11-kit for module loading, messages, and uri parsing.

 configure.ac                                |   13 +-
 daemon/gpg-agent/gkd-gpg-agent-standalone.c |    2 +-
 daemon/ssh-agent/gkd-ssh-agent-standalone.c |    2 +-
 docs/reference/gck/gck-sections.txt         |   10 +-
 gck/Makefile.am                             |    3 +
 gck/gck-enumerator.c                        |   12 +-
 gck/gck-misc.c                              |  212 +++----------
 gck/gck-module.c                            |  131 ++++-----
 gck/gck-modules.c                           |  136 +++------
 gck/gck-private.h                           |   21 +-
 gck/gck-slot.c                              |  147 ++++++---
 gck/gck-uri.c                               |  456 +++++++--------------------
 gck/gck.h                                   |   52 ++--
 gck/gck.pc.in                               |    2 +-
 gck/tests/test-gck-crypto.c                 |    2 +-
 gck/tests/test-gck-enumerator.c             |   64 ++--
 gck/tests/test-gck-module.c                 |    6 +-
 gck/tests/test-gck-modules.c                |    2 +-
 gck/tests/test-gck-object.c                 |    2 +-
 gck/tests/test-gck-session.c                |    2 +-
 gck/tests/test-gck-slot.c                   |    2 +-
 gck/tests/test-gck-uri.c                    |  320 ++++++++++----------
 gcr/Makefile.am                             |    6 +-
 gcr/gcr-collection-model.c                  |    4 +-
 gcr/gcr-library.c                           |    6 +-
 gcr/gcr-library.h                           |    2 +-
 gcr/gcr.pc.in                               |    2 +-
 27 files changed, 645 insertions(+), 974 deletions(-)

commit e75e8bc13f6568186b9f9fb05d9ad30ac3e95e59
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-06

    pkcs11: Fix deprecated use of g_atomic_int_exchange_and_add()

 pkcs11/gkm/gkm-util.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit a21619b1a21f506aa9eaa4dae8049841dd94578f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-06

    gnome2-store: Fix logic error when filename is already used.
    
     * Would fail to generate new unique filename without iterating.

 pkcs11/gnome2-store/gkm-gnome2-file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 79ef2cfd2079569b92f9452baeef2c1bec7b448d
Author: Michael Terry <michael.terry@canonical.com>
Date:   2011-07-05

    Add Unity to OnlyShowIn
    
    https://bugzilla.gnome.org/show_bug.cgi?id=653753

 daemon/gnome-keyring-gpg.desktop.in.in     |    2 +-
 daemon/gnome-keyring-pkcs11.desktop.in.in  |    2 +-
 daemon/gnome-keyring-secrets.desktop.in.in |    2 +-
 daemon/gnome-keyring-ssh.desktop.in.in     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit a05ed09e02347470a36b1eca84b715b024f4762a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-07-02

    Updated Norwegian bokmål translation

 po/nb.po |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit cfeb2dd76ad1623ba313b163580932155b5a3f84
Author: Yinghua Wang <wantinghard@gmail.com>
Date:   2011-07-01

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po |  620 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 404 insertions(+), 216 deletions(-)

commit 94b377833eeb7a3c3a5ba56b90161dc09e1db086
Author: Aurimas Černius <aurisc4@gmail.com>
Date:   2011-06-29

    Updated Lithuanian translation.

 po/lt.po | 1404 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 618 insertions(+), 786 deletions(-)

commit 36a43f4df31ef898b859388e2b299ff85fdc2057
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   2011-06-13

    Updated Slovenian translation

 po/sl.po |  322 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 226 insertions(+), 96 deletions(-)

commit 6f3cf4638596f9fa00cd9c4ee2d1e369626c69a6
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-06-09

    Updated Norwegian bokmål translation

 po/nb.po |  338 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 242 insertions(+), 96 deletions(-)

commit 91e325609b630f73df12c33ab493ddf4745d82a5
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-06-07

    pkcs11: Stop pkcs11 tests on failure.

 pkcs11/gkm/tests/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 06d89c6e2578655b7380c6c47a27ed2cd3e48897
Merge: 8008e3f 6bd797c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-06-07

    Merge branch 'gnome-3-0'

commit 6bd797cff9d4d402a8ef906d259dac0bf707e70d
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-06-07

    Fix build with GCC 4.6.0

 configure.in                     |    1 +
 daemon/gkd-main.c                |    2 +-
 daemon/gpg-agent/gkd-gpg-agent.c |    2 +-
 daemon/ssh-agent/gkd-ssh-agent.c |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

commit 8008e3f660a0d026a7f8b7fefa2caec103069423
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   2011-06-06

    Updated Galician translations

 po/gl.po |  351 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 244 insertions(+), 107 deletions(-)

commit 2f021a066290580458963e5d6ab3593f9e2e01cf
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   2011-06-04

    Updated Spanish translation

 po/es.po |  263 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 196 insertions(+), 67 deletions(-)

commit c48a80d8704ddba6d1f22e36cdc5e95423ad6810
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   2011-06-04

    Updated Hebrew translation.

 po/he.po |  308 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 218 insertions(+), 90 deletions(-)

commit f555936f6cc4de65d1cdb67257836b5fd58b6f3b
Merge: afdd535 65c9d54
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-06-04

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

commit 3098bd4d5a4abc6e7bc83e6dccd64aa359c9dc49
Author: Joshua Roys <roysjosh@gmail.com>
Date:   2011-05-31

    Fix algorithm check in prepare_and_encode_pkcs8_cipher

 pkcs11/gkm/gkm-data-der.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit afdd535fa2c8ad57cc1f14a073ac90275d2bd14e
Merge: 68551ba 5b3e79b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-31

    Merge branch 'gnome-3-0'

commit 5b3e79b3b2a06dbc6b65d9c2521209c51ed699c1
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-30

    pkcs11: Simulate a log out when application closes last session.
    
     * After the last session is closed by an application, we should return
       to a logged out state.
     * Simulate that log out, if the application didn't do it explicitly.

 pkcs11/gkm/gkm-module.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

commit 74f990b8beab63c57fbf9a6ae3df04f1be572b55
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-30

    gcr: Login properly when importing private keys.

 gcr/gcr-importer.c |   18 +++++++++++++++---
 gcr/gcr-parser.c   |   11 +++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

commit 39198027cd6f1faae6ea6a8283a7171458b03372
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-30

    gcr: Fix warnings using the importer.

 gcr/gcr-importer.c     |    2 +-
 gcr/gcr-parser.c       |    2 +-
 tool/gkr-tool-import.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 68551ba68ebe3d90fe46db595bc50d876984cb68
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   2011-05-29

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po |  675 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 418 insertions(+), 257 deletions(-)

commit 85564aaf1b8e6de71b028abdf5982ce87bc8dae4
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   2011-05-29

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po |  574 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 327 insertions(+), 247 deletions(-)

commit 2b8db8b075478dde8a7aa768cdb3a9a302999191
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:   2011-05-28

    Updated Russian translation

 po/ru.po |  504 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 295 insertions(+), 209 deletions(-)

commit b6928fd48a08f380fae02d0d2ea39a361c697825
Merge: 8674d10 17ad20f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-26

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	NEWS
    	configure.ac
    	docs/reference/gcr/Makefile.am
    	docs/reference/gcr/gcr-visual-index.xml
    	docs/reference/gcr/gcr-widgets.c
    	docs/reference/gcr/images/key-widget.png
    	gcr/Makefile.am

commit 17ad20f549fffab0e3fb0dcd6ee863826309fb5a
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-26

    Release version 3.0.3

 NEWS |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 8674d10429d9b47428bef5762626ce7bcb817a4b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-05-25

    Updated Spanish translation

 po/es.po |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 65795bed43dba42997ecfd539815f9a841d61a7e
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   2011-05-24

    Added screenshots

 po/es.po |  121 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 68 insertions(+), 53 deletions(-)

commit 7cefac2b4edd88b87b741d7930959757d1d00c77
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date:   2011-05-24

    egg: adapt SO_PEERCRED usage for OpenBSD
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650886

 egg/egg-unix-credentials.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 65c9d546623d31f35b15f4c0d412513ae82df6fd
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-06

    gcr: Parse and display certificate extensions.
    
     * Subject Alt Name
     * Basic Constraints
     * Extended Key Usage
     * Key Usage
     * Subject Key Identifier
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646907

 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(-)

commit 8510dcb39aeeb9e4b7230da4401f24f1bd64d614
Merge: 40fb2e4 0f84906
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-24

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

commit 40fb2e404ede6dc8b16dff865c3feec06ac3518f
Merge: 2468d94 e037705
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-24

    Merge branch 'display-hex'

commit 2468d94afdd30afa9713abd8d35a36046aababe7
Merge: 1705a85 7b5e4e3
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-24

    Merge branch 'split-selector'
    
    Conflicts:
    	gcr/Makefile.am
    	gcr/gcr-collection-model.c
    	gcr/gcr-tree-selector.c

commit 26c03d71fb085ee644550c27238b4c8dfbb22fc2
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-23

    secrets: Don't prompt multiple times for simultaneous unlocks
    
     * Serialize unlock requests for keyrings.
     * This has the effect of not prompting multiple times when simultaneous
       unlock requests come in for the same keyring.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649572

 daemon/dbus/gkd-secret-unlock.c |   72 +++++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 11 deletions(-)

commit 1705a8555b8c3776eabe366b0f7c51b2b4dcf6be
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-17

    gcr: Fix ununitialized memory in GcrColumns.

 gcr/gcr-collection-model.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit b6cb789d94b723e9d50c501413dff3c3e0414296
Author: Bruno Brouard <annoa.b@gmail.com>
Date:   2011-05-22

    Updated French translation

 po/fr.po |  431 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 250 insertions(+), 181 deletions(-)

commit 5b30194ff78834b5c9f79090aa2522306455f1cb
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-19

    Bump version number.

 configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e08c45da2f655c8e299ba75d314a1ee21856c2f2
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-19

    Release version 3.0.2

 NEWS               |    5 +++++
 configure.in       |    2 +-
 gcr/libgcr.symbols |    1 +
 3 files changed, 7 insertions(+), 1 deletions(-)

commit 528317789ba56c874e64093481689c8ff985b1d7
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-19

    gcr: Export list of symbols when making distribution.

 gcr/Makefile.am    |   10 +++-
 gcr/libgcr.symbols |  138 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 2 deletions(-)

commit a894adc8a0790565130b094b7538562a30123d01
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-19

    Revert "Bump libtool version of gnome-keyring library for 3.0"
    
    This reverts commit aebb7bf381694c3b72e456c2c1d19c0853d18836.
    
     * We also add back the deprecated symbol, and just leave it
       hanging around.

 configure.in      |    4 ++--
 gcr/gcr-library.c |    9 +++++++++
 gcr/gcr-types.h   |    8 ++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

commit ad67edd5fb25fca974f10f568c31a2316d728b79
Author: Vincent Untz <vuntz@gnome.org>
Date:   2011-05-06

    Accept to run if ipc_lock capability is not available
    
    We print a warning about potential use of unsecure memory, but still
    run (and drop unneeded capabilities if we have some). This is better
    than nothing.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649560

 daemon/gkd-capability.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

commit 11a5d410d9d2c9006d78cff05ee42759cc7731b1
Author: Vincent Untz <vuntz@gnome.org>
Date:   2011-05-06

    Improved checks for fs capabilities, and drop unneeded ones
    
    If we have fs capabilities, we first need to check that we really do
    have ipc_lock, and if that's the case we just keep ipc_lock and drop
    everything else.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649560

 daemon/gkd-capability.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

commit 89efa77a605078c501eff393f201911d24604565
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-16

    gcr: Cleanup GcrRecord after review.
    
     * Use G_DEFINE_BOXED_TYPE
     * Fix some test corner cases.
     * Locale independent integer parsing.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650255

 gcr/gcr-record.c        |   22 +++-------------------
 gcr/gcr-record.h        |    4 ++--
 gcr/tests/test-record.c |    4 ++++
 3 files changed, 9 insertions(+), 21 deletions(-)

commit 2383cf15f17f79240c442456488c2e4886e0811c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-13

    gcr: More record functionality.
    
     * Add boxed type for records
     * Allow parsing of space delimited records.
     * Lookup unsigned integers in records.
     * More tests for GcrRecord
    
    https://bugzilla.gnome.org/show_bug.cgi?id=650255

 docs/reference/gcr/gcr-sections.txt |    1 +
 gcr/gcr-record.c                    |  138 +++++++++++++++++++++++++++++++----
 gcr/gcr-record.h                    |   15 ++++
 gcr/tests/test-record.c             |  122 ++++++++++++++++++++++++++++++-
 4 files changed, 257 insertions(+), 19 deletions(-)

commit 17dd000b0c401a9e5da861086c8379b044aaea91
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Fix 'make dist' of doc directory.

 docs/reference/gcr/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 948688d39a4d6e4ff3cf0d8af6c069901cdc6222
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-12

    gcr: Rename GcrColons to GcrRecord
    
     * These records can be used for other purposes as well. Can represent
       any data with uniform single character delimiters

 .gitignore                          |    1 +
 docs/reference/gcr/gcr-sections.txt |   16 ++--
 gcr/Makefile.am                     |    2 +-
 gcr/gcr-colons.c                    |  152 -----------------------------
 gcr/gcr-colons.h                    |  106 --------------------
 gcr/gcr-gnupg-collection.c          |   80 ++++++++--------
 gcr/gcr-gnupg-key.c                 |  162 ++++++++++++++++----------------
 gcr/gcr-gnupg-key.h                 |   14 ++--
 gcr/gcr-record.c                    |  162 +++++++++++++++++++++++++++++++
 gcr/gcr-record.h                    |  109 +++++++++++++++++++++
 gcr/tests/Makefile.am               |    2 +-
 gcr/tests/test-colons.c             |  180 -----------------------------------
 gcr/tests/test-gnupg-collection.c   |    8 +-
 gcr/tests/test-gnupg-key.c          |   94 +++++++++---------
 gcr/tests/test-record.c             |  180 +++++++++++++++++++++++++++++++++++
 15 files changed, 642 insertions(+), 626 deletions(-)

commit c20711439758710fe38a5df58f5dd0557fb28a94
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Fix race condition in gnupg collection async tests.

 gcr/tests/test-gnupg-collection.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit c8a1239eb53110bff2e5b0610036c95e96075b26
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Stop tests when a failure occurs

 gcr/tests/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 33955d6f34ea8d428d72cfa328820ca77645bd9b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Fix tests for GcrGnupgKey keyid and short-keyid properties

 gcr/tests/test-gnupg-key.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

commit 3e668233e98f1c27ac8fcc34888b3d44ec4b2d64
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Fix annotation of _gcr_gnupg_key_get_secret_dataset

 gcr/gcr-gnupg-key.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 74a4ec824f826cb81e6bf6f8204d779f4341d0e2
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Fixes and debugging for GcrGnupgCollection.
    
     * Comments and review changes.
     * Add tests for collection loading and reloading.
     * Debug logging
     * Remove racy pid tracking. Will solve this in another branch.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648019

 gcr/gcr-debug.c                           |    1 +
 gcr/gcr-debug.h                           |    1 +
 gcr/gcr-gnupg-collection.c                |   61 +++++++------
 gcr/tests/Makefile.am                     |    1 +
 gcr/tests/files/gnupg-homedir/pubring.gpg |  Bin 19689 -> 21969 bytes
 gcr/tests/files/gnupg-homedir/secring.gpg |  Bin 0 -> 4398 bytes
 gcr/tests/files/gnupg-homedir/trustdb.gpg |  Bin 1200 -> 1400 bytes
 gcr/tests/test-gnupg-collection.c         |  136 ++++++++++++++++++++++++++---
 testing/gnupg-example/random_seed         |  Bin 600 -> 0 bytes
 9 files changed, 161 insertions(+), 39 deletions(-)

commit 00607c3b767b03955af981f5586ec4fb72a46ae4
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Make GcrGnupgKey::keyid full keyid and add short-keyid for display.
    
     * More documentation fixes and cleanup.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648019

 gcr/gcr-gnupg-key.c        |   42 ++++++++++++++++++++++++++++++++++--------
 gcr/gcr-gnupg-key.h        |    2 ++
 gcr/tests/test-gnupg-key.c |   31 +++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 8 deletions(-)

commit 2499a975104818217e83b1685ed390fcfb6661b5
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-15

    gcr: Documentation and naming fixes.
    
     * Fixes after review.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648019

 gcr/gcr-gnupg-collection.c |   45 +++++++++++++++++++-------------
 gcr/gcr-gnupg-key.c        |   61 +++++++++++++++++++++++++++++++------------
 2 files changed, 71 insertions(+), 35 deletions(-)

commit 046d8f51c8217dd26f054e2b27cf21c90c663a98
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-14

    gcr: Build GcrCertificateDetailsWidget and GcrCertificateBasicsWidget properly.
    
     * Forgot to inlcude these in the build.

 gcr/Makefile.am                      |    2 ++
 gcr/gcr-certificate-details-widget.h |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

commit 0f84906348a2a7654847c3ca679fff816657846c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-09

    gcr: Fix creation of fingerprints, make tests pass.
    
     * Fix encoding of test files.
     * Always encode NULL in RSA keys as the parameter.

 egg/pk.asn                      |    2 ++
 gcr/gcr-fingerprint.c           |   15 +++++++++++++--
 gcr/tests/files/client.crt      |  Bin 1054 -> 736 bytes
 gcr/tests/files/client.pem      |   18 ++++++++++++++++++
 gcr/tests/files/generic-dsa.crt |  Bin 1298 -> 918 bytes
 gcr/tests/files/generic-dsa.pem |   22 ++++++++++++++++++++++
 gcr/tests/test-fingerprint.c    |    8 ++++----
 7 files changed, 59 insertions(+), 6 deletions(-)

commit 0c68a6f28958d21d5f76815217e343842dc96766
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-09

    egg: Add support for encoding NULL in ASN.1

 egg/egg-asn1x.c       |   13 +++++++++++++
 egg/egg-asn1x.h       |    2 ++
 egg/tests/test-asn1.c |   25 +++++++++++++++++++++++++
 egg/tests/test.asn    |    2 ++
 4 files changed, 42 insertions(+), 0 deletions(-)

commit 28552e70b824a6c1327882291dc6e61fdaf5447e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-08

    gcr: Add tests for creation of fingerprints

 .gitignore                      |    1 +
 gcr/tests/Makefile.am           |    1 +
 gcr/tests/files/client.crt      |   18 ++++
 gcr/tests/files/client.key      |   27 ++++++
 gcr/tests/files/generic-dsa.crt |   22 +++++
 gcr/tests/files/generic-dsa.key |   12 +++
 gcr/tests/test-fingerprint.c    |  181 +++++++++++++++++++++++++++++++++++++++
 7 files changed, 262 insertions(+), 0 deletions(-)

commit 2d10ec93e02076b5df4d83284b208a29d5fb564e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-06

    gcr: Make key widget scroll and size properly.
    
    Also fix the test program.

 gcr/gcr-key-widget.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

commit c150351ec342697aed59ba2ebd396f6c0bd62063
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-03-09

    Implement calculation of fingerprints for keys.
    
    These are derived from subjectPublicKeyInfo
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646905

 egg/egg-asn1x.c                |    4 +-
 egg/egg-asn1x.h                |    2 +-
 gcr/Makefile.am                |    3 +-
 gcr/gcr-certificate-renderer.c |   19 ++-
 gcr/gcr-fingerprint.c          |  255 ++++++++++++++++++++++++++++++++++++++++
 gcr/gcr-fingerprint.h          |   40 ++++++
 gcr/gcr-key-renderer.c         |   20 +++-
 7 files changed, 331 insertions(+), 12 deletions(-)

commit e037705a72287f48218d62c4c198bf77f04f8e8d
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-06

    gcr: Add _gcr_display_view_append_hex() function.
    
    Displays value as a hex string, rather than just converting to hex
    everywhere and duplicating the same code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646901

 gcr/gcr-certificate-renderer.c |   31 ++++++++-----------------------
 gcr/gcr-display-view.c         |   16 ++++++++++++----
 gcr/gcr-display-view.h         |    6 ++++++
 gcr/gcr-key-renderer.c         |    2 --
 4 files changed, 26 insertions(+), 29 deletions(-)

commit b5fd76a82785ee4d5d056541b3425a217a548e5e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-12

    gcr: More testing for secret gnupg keys.
    
     * Create an example keyring
     * Change signature of _gcr_gnupg_key_new so it also accepts
       the secret part.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648019

 gcr/gcr-gnupg-collection.c        |    2 +-
 gcr/gcr-gnupg-key.c               |   50 +++++++++++++++++++++++++++-----
 gcr/gcr-gnupg-key.h               |    3 +-
 gcr/tests/test-gnupg-key.c        |   56 +++++++++++++++++++++++++++++++++++--
 testing/gnupg-example/pubring.gpg |  Bin 0 -> 21969 bytes
 testing/gnupg-example/random_seed |  Bin 0 -> 600 bytes
 testing/gnupg-example/secring.gpg |  Bin 0 -> 4398 bytes
 testing/gnupg-example/trustdb.gpg |  Bin 0 -> 1400 bytes
 8 files changed, 98 insertions(+), 13 deletions(-)

commit abfe89a22746a263f0cdec9f9c0802dc16920829
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-26

    gcr: Add support for listing secret gnupg keys.
    
     * Also add support to GcrGnupgKey for holding the secret info.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648019

 docs/reference/gcr/gcr-sections.txt |    2 +
 gcr/gcr-colons.h                    |    9 ++
 gcr/gcr-gnupg-collection.c          |  186 +++++++++++++++++++++++++----------
 gcr/gcr-gnupg-key.c                 |  109 ++++++++++++++++-----
 gcr/gcr-gnupg-key.h                 |    9 ++-
 5 files changed, 236 insertions(+), 79 deletions(-)

commit 0e2ae7fea4298e191ecfac108912d2f363822d98
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-13

    gcr: Fix problem loading translation for NULL column names.
    
     * Just use empty string.

 gcr/gcr-selector.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 929d0a377217e139574817d5c004312b40da5cc9
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-12

    gcr: Fix logic issue in collection model
    
     * Was refering to the wrong column.

 gcr/gcr-collection-model.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

commit 311e3ed6c596fe729d0e7c486728d2c8ecb85c9b
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   2011-05-13

    Updated Hebrew translation.

 po/he.po |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)

commit 7b5e4e3c1e8cf94a03f1bd21eacb53991b32f6c6
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-11

    gcr: Split GcrSelector into GcrComboSelector and GcrTreeSelector
    
     * GcrComboSelector allows selecting one object at a time
       and uses 'markup' property to display the object.
     * GcrTreeSelector uses various columns, and a checkbox so that multiple
       objects can be selected at once.
     * Add images for both of the above.
     * Derive directly from GtkComboBox and GtkTreeView respectively.

 .gitignore                                   |    2 +
 docs/reference/gcr/Makefile.am               |   10 +-
 docs/reference/gcr/gcr-docs.sgml             |    4 +-
 docs/reference/gcr/gcr-sections.txt          |   60 ++-
 docs/reference/gcr/gcr-visual-index.xml      |    6 +
 docs/reference/gcr/gcr-widgets.c             |   99 ++++-
 docs/reference/gcr/images/combo-selector.png |  Bin 0 -> 7855 bytes
 docs/reference/gcr/images/key-widget.png     |  Bin 8634 -> 8311 bytes
 docs/reference/gcr/images/tree-selector.png  |  Bin 0 -> 11930 bytes
 gcr/Makefile.am                              |    6 +-
 gcr/gcr-certificate.c                        |    2 +-
 gcr/gcr-collection-model.c                   |   73 +++-
 gcr/gcr-collection-model.h                   |    9 +-
 gcr/gcr-column.c                             |    4 +-
 gcr/gcr-combo-selector.c                     |  272 ++++++++++++
 gcr/gcr-combo-selector.h                     |   69 ++++
 gcr/gcr-selector.c                           |  566 --------------------------
 gcr/gcr-selector.h                           |   69 ----
 gcr/gcr-tree-selector.c                      |  464 +++++++++++++++++++++
 gcr/gcr-tree-selector.h                      |   70 ++++
 gcr/gcr.h                                    |    3 +-
 gcr/tests/Makefile.am                        |    5 +-
 gcr/tests/frob-combo-selector.c              |  117 ++++++
 gcr/tests/frob-gnupg-selector.c              |   14 +-
 gcr/tests/frob-selector.c                    |  106 -----
 gcr/tests/frob-tree-selector.c               |  124 ++++++
 26 files changed, 1356 insertions(+), 798 deletions(-)

commit 28c2950d1072f7c0ddc93848c1568160006c6315
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   2011-05-11

    Updated Slovenian translation

 po/sl.po |  452 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 260 insertions(+), 192 deletions(-)

commit 05ec5fb326989acfb5ae0845e84df04c0476ab98
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-10

    docs: Add images for gcr widgets.

 .gitignore                                       |    1 +
 docs/reference/gcr/Makefile.am                   |   35 ++-
 docs/reference/gcr/gcr-docs.sgml                 |    4 +
 docs/reference/gcr/gcr-shooter.c                 |  470 ++++++++++++++++++++++
 docs/reference/gcr/gcr-shooter.h                 |   23 +
 docs/reference/gcr/gcr-visual-index.xml          |   12 +
 docs/reference/gcr/gcr-widgets.c                 |   86 ++++
 docs/reference/gcr/images/certificate-widget.png |  Bin 0 -> 17514 bytes
 docs/reference/gcr/images/key-widget.png         |  Bin 0 -> 8634 bytes
 gcr/tests/files/cacert.org.cer                   |  Bin 0 -> 1857 bytes
 10 files changed, 629 insertions(+), 2 deletions(-)

commit 46948bf6b5be27aee150adca1e7939c25d2d2a4e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-10

    docs: Add images for gcr widgets.

 .gitignore                                       |    4 +
 docs/reference/gcr/Makefile.am                   |   35 ++-
 docs/reference/gcr/gcr-docs.sgml                 |    4 +
 docs/reference/gcr/gcr-shooter.c                 |  470 ++++++++++++++++++++++
 docs/reference/gcr/gcr-shooter.h                 |   23 +
 docs/reference/gcr/gcr-visual-index.xml          |   12 +
 docs/reference/gcr/gcr-widgets.c                 |   86 ++++
 docs/reference/gcr/images/certificate-widget.png |  Bin 0 -> 17514 bytes
 docs/reference/gcr/images/key-widget.png         |  Bin 0 -> 8634 bytes
 gcr/tests/files/cacert.org.cer                   |  Bin 0 -> 1857 bytes
 10 files changed, 632 insertions(+), 2 deletions(-)

commit 03554850e651df419badebeeed215ea66b503b3d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   2011-05-09

    Updated Spanish translation

 po/es.po |   62 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 34 insertions(+), 28 deletions(-)

commit 4e1e0f607a6581f03fe2ea73e776b1be20cd70c7
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-09

    Bump version number

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)