commit 3d33ea88777a94dccfba93d420f023c21f50f576
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-19

    Release version 3.3.3
    
     * Fix some compile warnings

 NEWS                            |   12 ++++++++++++
 libseahorse/seahorse-prefs.c    |    8 +++-----
 libseahorse/seahorse-progress.c |    4 +---
 pgp/seahorse-gpgme-data.c       |    4 ++--
 pgp/seahorse-gpgme-key.c        |    4 ++--
 ssh/seahorse-ssh-operation.c    |    2 +-
 6 files changed, 21 insertions(+), 13 deletions(-)

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

    Drop signal handlers in SeahorseCollection when disposing

 libseahorse/seahorse-collection.c |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

commit 24a839f8ca20e4c246a1c6d4386e9ccca36dc99c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-19

    Fix lack of refresh when a keyring is unlocked

 gkr/seahorse-gkr-keyring.c        |   15 +++++++++------
 libseahorse/seahorse-collection.c |   31 +++++++++++++++++++------------
 2 files changed, 28 insertions(+), 18 deletions(-)

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

    gkr: Remove Mnemonic from gkr keyring properties
    
    https://bugzilla.gnome.org/show_bug.cgi?id=664098

 gkr/seahorse-gkr-keyring.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

commit e12907aa4940ba20343c7e0fc50645ce8ba3bded
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   2011-12-15

    Updated Galician translations

 po/gl.po |  672 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 330 insertions(+), 342 deletions(-)

commit 21f6dd977b8e40fa160f766966efce8b37117125
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-12-14

    Updated Norwegian bokmål translation

 po/nb.po |  616 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 277 insertions(+), 339 deletions(-)

commit a364fcf31460d4dfd35c23198811a82ffa5b9056
Author: Mario Blättermann <mariobl@gnome.org>
Date:   2011-12-14

    [l10n] Updated German doc translation, fixed bug #666186

 help/de/de.po |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

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

    pkcs11: Fix bugs in key generation
    
     * Display algorithm correctly in key generation list when
       token selection changes
     * Remove invalid assertion when generation completes

 pkcs11/seahorse-pkcs11-generate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 0d1b117c051a271b1a3d1f651f500bba182bcf6c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-14

    Update combined view when places are loaded
    
     * Previously if places weren't selected, then on startup, certain
       objects wouldn't show up.

 src/seahorse-key-manager.c |    6 +++---
 src/seahorse-sidebar.c     |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

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

    Fix problem loading correct size for the sidebar

 src/seahorse-key-manager.c |   65 +++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 33 deletions(-)

commit 6d1271f1bcd585c526b6281eff93243353d64e1b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-14

    pgp: Fix selection of keys for the sync action

 libseahorse/seahorse-catalog.c |    1 +
 pgp/seahorse-pgp-actions.c     |   28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

commit 581b91c05bdfd8ae6090c5f3bfe67756e6ab62c1
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-13

    pgp: Move the import_async/import_finish virtual methods into pgp code
    
     * Only used from pgp code, specifically seahorse-transfer.c so
       move these there instead of in SeahorsePlace

 libseahorse/seahorse-place.c |   39 ++++++---------------------------------
 libseahorse/seahorse-place.h |   24 ++----------------------
 pgp/seahorse-gpgme-keyring.c |   15 ++++++---------
 pgp/seahorse-gpgme-keyring.h |   10 ++++++++++
 pgp/seahorse-hkp-source.c    |   15 ++++++++-------
 pgp/seahorse-ldap-source.c   |   14 +++++++-------
 pgp/seahorse-server-source.c |   27 +++++++++++++++++++++++++++
 pgp/seahorse-server-source.h |   20 ++++++++++++++++++++
 pgp/seahorse-transfer.c      |   26 +++++++++++++++++++++++---
 ssh/seahorse-ssh-source.c    |   15 ++++++---------
 ssh/seahorse-ssh-source.h    |   10 ++++++++++
 11 files changed, 125 insertions(+), 90 deletions(-)

commit 7907fc56b1e9a406b7baa0c7da4ed188757b029e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-13

    Add way to lookup places, and refresh appropriate place after import
    
     * Since importing is done by libgcr, we look up the uri on the
       importer.
     * So then we need a way to find the place that matches a uri.
       URIs aren't always unique, so virtual method on SeahorseBackend
     * Make refresh methods on place be virtual, so we can call from
       generic code.

 gkr/seahorse-gkr-backend.c        |   33 +++++++++++++++++-------
 gkr/seahorse-gkr-keyring.c        |   37 ++++++++++++---------------
 gkr/seahorse-gkr-keyring.h        |   11 --------
 libseahorse/seahorse-backend.c    |   33 ++++++++++++++++++++++++
 libseahorse/seahorse-backend.h    |   13 ++++++++-
 libseahorse/seahorse-place.c      |   27 +++++++++++++++++--
 libseahorse/seahorse-place.h      |   22 ++++++++++++++-
 pgp/seahorse-gpgme-keyring.c      |   15 ++++++----
 pgp/seahorse-gpgme-keyring.h      |    9 ------
 pgp/seahorse-pgp-backend.c        |   22 ++++++++++++----
 pkcs11/seahorse-pkcs11-backend.c  |   50 ++++++++++++++++++++++++++----------
 pkcs11/seahorse-pkcs11-backend.h  |    1 +
 pkcs11/seahorse-pkcs11-generate.c |    2 +-
 pkcs11/seahorse-token.c           |   38 ++++++++++++++--------------
 pkcs11/seahorse-token.h           |    9 ------
 src/seahorse-import-dialog.c      |   16 ++++++++++++
 src/seahorse-sidebar.c            |    3 +-
 ssh/seahorse-ssh-backend.c        |   32 ++++++++++++++++++-----
 ssh/seahorse-ssh-source.c         |   15 ++++++----
 ssh/seahorse-ssh-source.h         |    9 ------
 20 files changed, 260 insertions(+), 137 deletions(-)

commit 6984d33cffd20793eb7253829e9844d966441c14
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-13

    Fix filter on file for importer
    
     * And remove some unused code, clean up

 libseahorse/seahorse-util.c |  218 -------------------------------------------
 libseahorse/seahorse-util.h |   20 ----
 pgp/seahorse-gpgme-photos.c |  106 +++++++++++----------
 src/seahorse-key-manager.c  |   65 ++++++++++++--
 4 files changed, 113 insertions(+), 296 deletions(-)

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

    Fix ordering of top level menu items

 libseahorse/seahorse-catalog.c    |    4 ++--
 pgp/seahorse-keyserver-results.c  |   22 +++++-----------------
 pgp/seahorse-keyserver-results.ui |    8 +++++---
 ssh/seahorse-ssh-actions.c        |    8 +++++---
 4 files changed, 17 insertions(+), 25 deletions(-)

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

    Fix importing from SeahorseKeyserverResults window

 pgp/seahorse-keyserver-results.c |    4 +++-
 pgp/seahorse-pgp-backend.c       |    4 ++--
 pgp/seahorse-transfer.c          |   20 ++++++++++++++++----
 pgp/seahorse-transfer.h          |    2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

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

    Remove unneeded 'selected' property from SeahorseKeyserverResults

 pgp/seahorse-keyserver-results.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

commit feb389bffd7e4f6f94512ff6fe81dbd6892b6275
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-12-13

    Updated Spanish translation

 po/es.po |  570 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 279 insertions(+), 291 deletions(-)

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

    Update translatable files

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

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

    Rework how actions work for places
    
     * Create menu ourselves, and use SeahorseDeletable, SeahorseLockable
       and other interfaces to create popup menu.
     * Remove the clone_for_objects strangeness in SeahorseActions
     * In the future we may move away from SeahorseActions all together

 gkr/seahorse-gkr-actions.c       |  340 ++++----------------------------------
 gkr/seahorse-gkr-actions.h       |    6 +-
 gkr/seahorse-gkr-item.c          |   10 +-
 gkr/seahorse-gkr-keyring.c       |    7 +-
 gkr/seahorse-gkr-keyring.h       |    5 +-
 libseahorse/seahorse-action.c    |   42 ++++-
 libseahorse/seahorse-action.h    |    8 +-
 libseahorse/seahorse-actions.c   |   96 +++++++++--
 libseahorse/seahorse-actions.h   |   13 +-
 libseahorse/seahorse-catalog.c   |   30 ++--
 libseahorse/seahorse-catalog.h   |    4 +-
 pgp/seahorse-keyserver-results.c |    9 +-
 pgp/seahorse-pgp-actions.c       |   68 +-------
 pkcs11/Makefile.am               |    1 -
 pkcs11/seahorse-certificate.c    |    7 +-
 pkcs11/seahorse-pkcs11-actions.c |  248 ---------------------------
 pkcs11/seahorse-pkcs11-actions.h |   31 ----
 pkcs11/seahorse-private-key.c    |    6 +-
 pkcs11/seahorse-token.c          |    6 +-
 src/seahorse-generate-select.c   |    4 +-
 src/seahorse-key-manager.c       |   11 +-
 src/seahorse-sidebar.c           |  285 +++++++++++++++++++++++++++-----
 src/seahorse-sidebar.h           |    4 +
 ssh/seahorse-ssh-actions.c       |   23 +---
 24 files changed, 448 insertions(+), 816 deletions(-)

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

    Add SeahorseLockable for locking/unlocking places
    
     * Generic interface doing what we were already doing in various places
       in the code.
     * Simplifies sidebar lock/unlock icon code.
     * In the future will be used to build the context menu on the sidebar

 gkr/seahorse-gkr-keyring.c         |  106 +++++++++++-
 libseahorse/Makefile.am            |    2 +
 libseahorse/seahorse-interaction.c |  194 ++++++++++++++++++++
 libseahorse/seahorse-interaction.h |   58 ++++++
 libseahorse/seahorse-lockable.c    |  143 +++++++++++++++
 libseahorse/seahorse-lockable.h    |   89 +++++++++
 pkcs11/Makefile.am                 |    1 -
 pkcs11/seahorse-interaction.c      |  194 --------------------
 pkcs11/seahorse-interaction.h      |   58 ------
 pkcs11/seahorse-pkcs11-actions.c   |   13 +-
 pkcs11/seahorse-token.c            |  351 ++++++++++++++++++------------------
 pkcs11/seahorse-token.h            |   20 --
 src/seahorse-sidebar.c             |  171 ++++++++++--------
 13 files changed, 867 insertions(+), 533 deletions(-)

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

    pgp: Fix key server and syncing bugs

 pgp/seahorse-hkp-source.c         |   20 +++----
 pgp/seahorse-keyserver-sync.c     |   17 +++++-
 pgp/seahorse-ldap-source.c        |    8 ++--
 pgp/seahorse-pgp-backend.c        |   38 ++++++++------
 pgp/seahorse-pgp-backend.h        |    4 +-
 pgp/seahorse-pgp-key-properties.c |   64 +++++++++++++-----------
 pgp/seahorse-server-source.c      |    2 +-
 pgp/seahorse-server-source.h      |    4 +-
 pgp/seahorse-transfer.c           |   81 ++++++++++++++++++++++++-------
 pgp/seahorse-transfer.h           |    9 +++-
 pgp/seahorse-unknown-source.c     |   98 ++++++++++++++++++++++++++++++++++--
 11 files changed, 251 insertions(+), 94 deletions(-)

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

    Add SeahorseViewable interface, and use for showing properties

 gkr/seahorse-gkr-actions.c          |   26 +---------------
 gkr/seahorse-gkr-item.c             |   19 +++++++++++
 gkr/seahorse-gkr-keyring.c          |   18 ++++++++++
 libseahorse/Makefile.am             |    1 +
 libseahorse/seahorse-catalog.c      |   42 ++++++++-----------------
 libseahorse/seahorse-viewable.c     |   59 +++++++++++++++++++++++++++++++++++
 libseahorse/seahorse-viewable.h     |   55 ++++++++++++++++++++++++++++++++
 pgp/seahorse-pgp-actions.c          |   10 ------
 pgp/seahorse-pgp-key.c              |   39 ++++++++++++++++-------
 pkcs11/seahorse-certificate.c       |   19 +++++++++++
 pkcs11/seahorse-pkcs11-actions.c    |   37 ++--------------------
 pkcs11/seahorse-pkcs11-properties.c |    2 +
 pkcs11/seahorse-pkcs11-properties.h |    1 -
 pkcs11/seahorse-private-key.c       |   19 +++++++++++
 ssh/seahorse-ssh-actions.c          |   20 ------------
 ssh/seahorse-ssh-key.c              |   18 ++++++++++
 16 files changed, 254 insertions(+), 131 deletions(-)

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

    Rename SeahorseViewer to SeahorseCatalog
    
     * Since we want to use the name 'viewer' for viewing specific items.
     * The SeahorseCatalog represents a list of items in the main window
       and in the key server listing

 gkr/seahorse-gkr-backend.c       |    1 -
 libseahorse/Makefile.am          |    2 +-
 libseahorse/seahorse-actions.h   |    2 +-
 libseahorse/seahorse-catalog.c   |  645 ++++++++++++++++++++++++++++++++++++++
 libseahorse/seahorse-catalog.h   |   82 +++++
 libseahorse/seahorse-viewer.c    |  645 --------------------------------------
 libseahorse/seahorse-viewer.h    |   82 -----
 pgp/seahorse-keyserver-results.c |   52 ++--
 pgp/seahorse-keyserver-results.h |    6 +-
 pkcs11/seahorse-interaction.h    |    1 -
 src/seahorse-key-manager.c       |   58 ++--
 src/seahorse-key-manager.h       |    6 +-
 12 files changed, 790 insertions(+), 792 deletions(-)

commit 7e92c04c58e187cba7fa7d94e207cb8ff7751f37
Author: Mario Blättermann <mariobl@gnome.org>
Date:   2011-12-11

    [l10n] Updated German translation

 po/de.po |  526 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 266 insertions(+), 260 deletions(-)

commit 277b304b4c0250dfe3e89a009a55c69f26d37669
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   2011-12-10

    Updated Hebrew translation.

 po/he.po |  928 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 538 insertions(+), 390 deletions(-)

commit bc48a084e8d99b6ebf2a690b2d9c94972724fe53
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-12-09

    Updated Spanish translation

 po/es.po |  103 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 48 insertions(+), 55 deletions(-)

commit 66c4f8b37a34ef6fe748dfef879ef817ba783037
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:   2011-12-09

    Remove extra accellerator in 'Show any' option

 src/seahorse-key-manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 914689a787a1181659504caf80a3b1035c747f73
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:   2011-12-09

    Fixing typo in SSH Generate dialog

 ssh/seahorse-ssh-generate.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

    pkcs11: Show errors for unlock/lock failures
    
     * And ignore some relevant errors

 pkcs11/seahorse-pkcs11-actions.c |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

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

    pkcs11: Set GcrKeyRenderer object property to private key
    
     * Allows the renderer to retrieve key related attributes from
       the pkcs11 store.

 pkcs11/seahorse-pkcs11-properties.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 6f7af07da7dcaeee08c52baf13905d86437b6476
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-09

    pkcs11: Add 'exportable' property to SeahorsePrivateKey
    
     * And also add the SeahorseExportable interface, but no private
       key exporters yet. No time to implement at this point.

 pkcs11/seahorse-private-key.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

commit 47223c01005fe141a7023a4abf7be9abdd68c694
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   2011-12-08

    Updated Slovenian translation

 po/sl.po |  978 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 583 insertions(+), 395 deletions(-)

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

    Bump version number

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

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

    Update for changes in libgck
    
     * In particular the GckBuilder change and GckObjectCache
     * Depend on gck version 3.3.3

 configure.ac                      |    4 +-
 pkcs11/seahorse-certificate.c     |   30 +++++++++++++++++----
 pkcs11/seahorse-pkcs11-generate.c |   51 +++++++++++++++++++-----------------
 pkcs11/seahorse-private-key.c     |   28 ++++++++++++++++---
 pkcs11/seahorse-token.c           |   34 +++++++++++-------------
 5 files changed, 91 insertions(+), 56 deletions(-)

commit 39e8f2dbaf67c616cf05411233cf85afa97cb7e8
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-08

    Fixes for glib 2.31.x deprecations
    
     * Remove use of g_atexit()
     * Fix for warning for missing varargs sentinel

 libseahorse/seahorse-passphrase.c |    2 +-
 libseahorse/seahorse-util.c       |   51 -------------------------------------
 libseahorse/seahorse-util.h       |    5 ---
 pgp/seahorse-discovery.c          |   17 +++++++++++-
 4 files changed, 17 insertions(+), 58 deletions(-)

commit b4f78823341a08302e9bd8366674cde9ecdd8024
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   2011-12-03

    Updated Galician translations

 po/gl.po |  891 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 501 insertions(+), 390 deletions(-)

commit 1dab455b1eef613284483060c93b9893e2f85d23
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   2011-12-03

    Updated Galician translations

 po/gl.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c13e48e944b00e7f16004c7ca818c629c638d90f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-12-02

    Updated Spanish translation

 po/es.po |  833 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 432 insertions(+), 401 deletions(-)

commit 0c9f8ae1357bc18c4e2efc52bd49405b048bed4e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-12-01

    Updated Norwegian bokmål translation

 po/nb.po |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 79 insertions(+), 18 deletions(-)

commit 1cde9aeb903458e7e81a3bf24485d6329be79c30
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   2011-12-01

    Updated POTFILES.in

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

commit 7e88c2ac0fb40a4f6908443f16f789bc89dc7ad1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-12-01

    Updated Norwegian bokmål translation

 po/nb.po |  737 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 364 insertions(+), 373 deletions(-)

commit 3b34b0009119313d903566ecd01a21a62500e345
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-12-01

    Refactor deleting, add SeahorseDeleter and SeahorseDeletable types
    
     * SeahorseDeletable is an interface implemented by objects that can
       be deletable, with a "deletable" boolean property, and a create_deleter()
       method.
     * SeahorseDeleter is an object that can delete objects, combining them
       if possible.

 gkr/Makefile.am                      |    2 +
 gkr/seahorse-gkr-actions.c           |  110 ++------------
 gkr/seahorse-gkr-item-deleter.c      |  271 ++++++++++++++++++++++++++++++++++
 gkr/seahorse-gkr-item-deleter.h      |   42 ++++++
 gkr/seahorse-gkr-item.c              |   25 +++-
 gkr/seahorse-gkr-keyring-deleter.c   |  228 ++++++++++++++++++++++++++++
 gkr/seahorse-gkr-keyring-deleter.h   |   42 ++++++
 gkr/seahorse-gkr-keyring.c           |   22 +++-
 gkr/seahorse-gkr-operation.c         |  148 ------------------
 gkr/seahorse-gkr-operation.h         |    8 -
 libseahorse/Makefile.am              |    2 +
 libseahorse/seahorse-deletable.c     |  185 +++++++++++++++++++++++
 libseahorse/seahorse-deletable.h     |   53 +++++++
 libseahorse/seahorse-deleter.c       |  135 +++++++++++++++++
 libseahorse/seahorse-deleter.h       |   92 ++++++++++++
 libseahorse/seahorse-exportable.c    |   22 +++-
 libseahorse/seahorse-exportable.h    |    2 +
 libseahorse/seahorse-object.c        |   18 ++-
 libseahorse/seahorse-viewer.c        |   32 ++---
 pgp/Makefile.am                      |    2 +
 pgp/seahorse-gpgme-key-deleter.c     |  181 +++++++++++++++++++++++
 pgp/seahorse-gpgme-key-deleter.h     |   42 ++++++
 pgp/seahorse-gpgme-key.c             |   22 +++
 pgp/seahorse-gpgme-secret-deleter.c  |  177 ++++++++++++++++++++++
 pgp/seahorse-gpgme-secret-deleter.h  |   42 ++++++
 pgp/seahorse-pgp-actions.c           |  117 ---------------
 pkcs11/Makefile.am                   |    3 +-
 pkcs11/seahorse-certificate.c        |   51 ++++++-
 pkcs11/seahorse-pkcs11-actions.c     |   63 --------
 pkcs11/seahorse-pkcs11-deleter.c     |  235 +++++++++++++++++++++++++++++
 pkcs11/seahorse-pkcs11-deleter.h     |   55 +++++++
 pkcs11/seahorse-pkcs11-key-deleter.c |  150 +++++++++++++++++++
 pkcs11/seahorse-pkcs11-key-deleter.h |   42 ++++++
 pkcs11/seahorse-pkcs11-operations.c  |  146 ------------------
 pkcs11/seahorse-pkcs11-operations.h  |   36 -----
 pkcs11/seahorse-pkcs11-properties.c  |   67 +++------
 pkcs11/seahorse-private-key.c        |   29 ++++-
 pkcs11/seahorse-token.c              |   25 +++-
 pkcs11/seahorse-token.h              |    3 +
 ssh/Makefile.am                      |    1 +
 ssh/seahorse-ssh-actions.c           |   44 ------
 ssh/seahorse-ssh-deleter.c           |  205 +++++++++++++++++++++++++
 ssh/seahorse-ssh-deleter.h           |   42 ++++++
 ssh/seahorse-ssh-key.c               |   20 ++-
 44 files changed, 2496 insertions(+), 743 deletions(-)

commit 100433b2c40b26dcc4c023fd8bbf65ec0fcc83cb
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-30

    Only enable export and copy actions if exportable objects selected

 libseahorse/seahorse-viewer.c |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

commit 064f51fff735b404d8c12e3b39863cf2483be0e5
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-30

    pkcs11: Ignore NSS Generic Crypto Services token
    
     * No need to show this in seahorse

 pkcs11/seahorse-pkcs11-backend.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 36c02a04d3800624f9aa3e87efaadc817463908b
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-30

    Show import errors in an info bar in the import dialog

 src/seahorse-import-dialog.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

commit feb4b00d59f2e0936adc1267c06c04f5acb5f7ee
Author: Mario Blättermann <mariobl@gnome.org>
Date:   2011-11-29

    [l10n] Updated German translation

 po/de.po |  732 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 433 insertions(+), 299 deletions(-)

commit 721e4d33294d7e77df5014348b8989c5cfd40959
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-29

    Fix issues filtering on personal, trusted, and any items

 pkcs11/seahorse-certificate.c |   51 +++++++++++++++++++++++++++---
 src/seahorse-key-manager.c    |   68 ++++++++++++++++++++++++-----------------
 2 files changed, 86 insertions(+), 33 deletions(-)

commit 392abc38a3ebafb8d7f2c86f836c1ff3171635e7
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-29

    pkcs11: Don't copy certificate value unnecessarily.

 pkcs11/seahorse-certificate.c |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

commit 27614a2257ac0c663eb1372631c1870852eff05f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-28

    Reimplement export functionality
    
     * SeahorseExportable interface on an object indicates export capability.
     * SeahorseExporter represents a format for a given set of objects.
     * Multiple objects can be combined using seahorse_exportable_add_object()
       if the format supports it.
     * So far only implemented one certificate exporter.

 libseahorse/Makefile.am                    |    2 +
 libseahorse/seahorse-exportable.c          |  427 ++++++++++++++++++++++++++
 libseahorse/seahorse-exportable.h          |   72 +++++
 libseahorse/seahorse-exporter.c            |  273 +++++++++++++++++
 libseahorse/seahorse-exporter.h            |  101 +++++++
 libseahorse/seahorse-key-manager-store.c   |   88 ++----
 libseahorse/seahorse-place.c               |  168 -----------
 libseahorse/seahorse-place.h               |   37 ---
 libseahorse/seahorse-util.c                |  285 +++---------------
 libseahorse/seahorse-util.h                |   19 +-
 libseahorse/seahorse-viewer.c              |  165 +++--------
 pgp/Makefile.am                            |    1 +
 pgp/seahorse-gpg-op.c                      |   53 ++--
 pgp/seahorse-gpg-op.h                      |    2 +-
 pgp/seahorse-gpgme-exporter.c              |  445 ++++++++++++++++++++++++++++
 pgp/seahorse-gpgme-exporter.h              |   47 +++
 pgp/seahorse-gpgme-key.c                   |   48 +++-
 pgp/seahorse-gpgme-keyring.c               |  152 +----------
 pgp/seahorse-hkp-source.c                  |   48 ++--
 pgp/seahorse-ldap-source.c                 |   56 ++--
 pgp/seahorse-pgp-key-properties.c          |   82 ++----
 pgp/seahorse-server-source.c               |   10 +-
 pgp/seahorse-server-source.h               |    8 +-
 pgp/seahorse-transfer.c                    |   67 +++--
 pkcs11/Makefile.am                         |    1 +
 pkcs11/seahorse-certificate-der-exporter.c |  245 +++++++++++++++
 pkcs11/seahorse-certificate-der-exporter.h |   41 +++
 pkcs11/seahorse-certificate.c              |   27 ++-
 pkcs11/seahorse-pkcs11-properties.c        |   22 ++-
 po/POTFILES.in                             |    4 +
 src/seahorse-key-manager.ui                |    2 +
 ssh/Makefile.am                            |    1 +
 ssh/seahorse-ssh-exporter.c                |  321 ++++++++++++++++++++
 ssh/seahorse-ssh-exporter.h                |   42 +++
 ssh/seahorse-ssh-key-properties.c          |   77 ++---
 ssh/seahorse-ssh-key.c                     |   37 ++-
 ssh/seahorse-ssh-key.h                     |    2 +
 ssh/seahorse-ssh-operation.c               |  114 +++-----
 ssh/seahorse-ssh-source.c                  |   82 -----
 39 files changed, 2464 insertions(+), 1210 deletions(-)

commit 1ce0826be33c1c924bf0b3436811640f690343e0
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:   2011-11-27

    Updated Romanian translation

 po/ro.po | 3152 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1658 insertions(+), 1494 deletions(-)

commit 50dc814f6d4f037495088e470535064ca3d7fb29
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   2011-11-26

    Updated Spanish translation

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

commit 6e69115d5caf97283111d60edcf2fe213246814a
Author: Muhammet Kara <muhammet.k@gmail.com>
Date:   2011-11-26

    [l10n]Updated Turkish translation

 po/tr.po | 3207 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1723 insertions(+), 1484 deletions(-)

commit bd28080eb3997596dd5331dad55d4ca588ed5999
Author: Aron Xu <aronxu@gnome.org>
Date:   2011-11-26

    Update Simplified Chinese translation.

 po/zh_CN.po | 1818 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1082 insertions(+), 736 deletions(-)

commit bb3ccc874940075b0ba9ab48113f7a61bf1c2abf
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-11-25

    Updated Spanish translation

 po/es.po |  171 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 127 insertions(+), 44 deletions(-)

commit e8f8521c529cf700bffb4a0fa454b6d756d2e9ad
Author: Daniel Nylander <po@danielnylander.se>
Date:   2011-11-25

    Updated Swedish translation

 po/sv.po | 2236 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1493 insertions(+), 743 deletions(-)

commit 9a7ff94414fcbb6ac08071a537280b1f254b626d
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   2011-11-24

    Updated POTFILES.in

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

commit 6daebac736c3fe3a8173443eca26f17bff0d427c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-22

    pkcs11: Support for creating certificate requests
    
     * Add an action button in the key properties window

 pkcs11/Makefile.am                  |    4 +-
 pkcs11/seahorse-pkcs11-properties.c |   92 ++++++++-
 pkcs11/seahorse-pkcs11-request.c    |  379 +++++++++++++++++++++++++++++++++++
 pkcs11/seahorse-pkcs11-request.h    |   34 +++
 pkcs11/seahorse-pkcs11-request.xml  |  114 +++++++++++
 5 files changed, 615 insertions(+), 8 deletions(-)

commit 6df2460eb5cef806c1df147b93a7beb3700f4459
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-14

    pkcs11: Support for PKCS#11 key generation
    
     * Used to generate keys on smart cards and the like
     * Also code for detecting which mechanisms a slot supports.

 libseahorse/seahorse-key-manager-store.c |    1 +
 pkcs11/Makefile.am                       |    4 +-
 pkcs11/seahorse-pkcs11-backend.c         |   51 +++-
 pkcs11/seahorse-pkcs11-backend.h         |    3 +
 pkcs11/seahorse-pkcs11-generate.c        |  517 ++++++++++++++++++++++++++++++
 pkcs11/seahorse-pkcs11-generate.h        |   35 ++
 pkcs11/seahorse-pkcs11-generate.xml      |  246 ++++++++++++++
 pkcs11/seahorse-token.c                  |   42 +++-
 pkcs11/seahorse-token.h                  |    5 +
 9 files changed, 897 insertions(+), 7 deletions(-)

commit 37a3e8cb56cf5027bbdb07ca3cbd381ac713e087
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   2011-11-22

    Updated Spanish translation

 po/es.po |  269 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 156 insertions(+), 113 deletions(-)

commit 659d593ce64252725e76d7df7bcb10db3d3894a0
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-22

    gkr: Fix keyring description string
    
    https://bugzilla.gnome.org/show_bug.cgi?id=664407

 gkr/seahorse-gkr-keyring.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit df4015ac031b01b8070a37d460f4df916b85db51
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-22

    pkcs11: Fix null dereference in certificate destructor

 pkcs11/seahorse-certificate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1aa3c8c6b9dc704fc8f6f6029f876b83e836bb80
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-11-22

    pkcs11: Implement toolbar and deletion from pkcs11 properties window

 gkr/seahorse-gkr-actions.c           |    9 +-
 libseahorse/Makefile.am              |    1 +
 libseahorse/seahorse-delete-dialog.c |  279 ++++++++++++++++++++++++++++++++++
 libseahorse/seahorse-delete-dialog.h |   63 ++++++++
 libseahorse/seahorse-util.c          |   45 ------
 libseahorse/seahorse-util.h          |    3 -
 pgp/seahorse-pgp-actions.c           |    7 +-
 pgp/seahorse-pgp-key-properties.c    |    5 +-
 pkcs11/seahorse-pkcs11-actions.c     |    7 +-
 pkcs11/seahorse-pkcs11-properties.c  |  166 ++++++++++++++++++++-
 ssh/seahorse-ssh-actions.c           |    7 +-
 11 files changed, 527 insertions(+), 65 deletions(-)