commit 3ddfcdb14026644c8c580d6f51c68b314a3d203f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-30

    Paper bag release: Actually update the version to 3.1.90

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

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

    Release version 3.1.90

 Makefile.am                                     |    4 +-
 NEWS                                            |   12 +
 configure.ac                                    |    4 -
 reference/.gitignore                            |    3 -
 reference/Makefile.am                           |    1 -
 reference/libseahorse/.gitignore                |   16 -
 reference/libseahorse/Makefile.am               |   61 ---
 reference/libseahorse/libseahorse-docs.sgml     |   65 ---
 reference/libseahorse/libseahorse-sections.txt  |  598 -----------------------
 reference/libseahorse/version.xml.in            |    1 -
 10 files changed, 13 insertions(+), 752 deletions(-)

commit 172d39e425b699788c91a93406f6076f930ed167
Merge: 2987f11 53d08ef
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-30

    Merge branch 'seahorse-name'

commit 2987f11991837e6c0d8ebb745cabaa0475fe13a6
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-30

    Fix various generation dialog selectors
    
     * Drop down algorithm choices
     * Bigger window for selection of what to generate
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655720

 libseahorse/seahorse-add-keyserver.xml |    7 -
 pgp/seahorse-pgp-generate.xml          |    7 -
 src/seahorse-generate-select.c         |    1 +
 src/seahorse-generate-select.xml       |  111 ++++++++++--------
 ssh/seahorse-ssh-generate.c            |    2 +-
 ssh/seahorse-ssh-generate.xml          |  197 +++++++++++++++++++------------
 6 files changed, 187 insertions(+), 138 deletions(-)

commit fbbd7ac2ca93b1c97bb2e1ce769359641479534d
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:   2011-08-30

    Unmark fuzzy string in French translation

 help/fr/fr.po |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

commit 8bc807e0252d8e7154d340f736125624d24bd19f
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:   2011-08-29

    Update French translation

 help/fr/fr.po |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

commit 53d08efd5b5e7c8127a78b3e289fa59c7446cee6
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-30

    Rename to 'Passwords and Keys'
    
     * Shorter more to the point name.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657217

 help/C/seahorse.xml        |    6 +++---
 src/seahorse-key-manager.c |    2 +-
 src/seahorse-main.c        |    2 +-
 src/seahorse-viewer.c      |    2 +-
 src/seahorse.1             |    2 +-
 src/seahorse.desktop.in.in |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

commit 5cde3baa972639897e88baf6e10101b8e21a4ef6
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:   2011-08-29

    Fix misuse of ngettext
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657617

 gkr/seahorse-gkr-item-commands.c    |    2 +-
 gkr/seahorse-gkr-keyring-commands.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

    Don't do a warning when key server uri scheme not supported.
    
     * Instead a message since this is external stimuli.

 pgp/seahorse-server-source.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 97bedc1665323c1e4fe717fecd6fd50ad1961a2c
Author: Mario Blättermann <mariobl@gnome.org>
Date:   2011-08-28

    [l10n] Updated German translation

 po/de.po | 1811 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 845 insertions(+), 966 deletions(-)

commit d06557bc4239154a55269a4bfdac291dd6c7b6e1
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:   2011-08-27

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1793 +++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po | 1803 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 1672 insertions(+), 1924 deletions(-)

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

    Remove SeahorseOperation from libseahorse reference.

 reference/libseahorse/libseahorse-sections.txt |   53 ------------------------
 1 files changed, 0 insertions(+), 53 deletions(-)

commit 324b9f32c574110a780e771b79f555d942778ccb
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-25

    pkcs11: Changes for GCK API cleanup
    
     * And update dependency on latest GCR/GCK

 configure.ac                    |    2 +-
 pkcs11/seahorse-pkcs11-module.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 7d18b759944c8e751ad98a3519019a2ed04df8f0
Author: Fran Dieguez <fran@openhost.es>
Date:   2011-08-24

    Updated Galician translations

 po/gl.po | 1853 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 866 insertions(+), 987 deletions(-)

commit 6f5f90af56be68d543226c3d38364710944fa4ff
Author: Daniel Nylander <po@danielnylander.se>
Date:   2011-08-24

    Updated Swedish translation

 po/sv.po | 1722 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 763 insertions(+), 959 deletions(-)

commit e80af9b74fab8b02362fcdc635c80acb40a9c59a
Author: Gil Forcada <gforcada@gnome.org>
Date:   2011-08-22

    [l10n]Updated Catalan translation

 po/ca.po | 1918 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 894 insertions(+), 1024 deletions(-)

commit bdd1950949a3a63a1a1a4aeee561d2da55b3a03c
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   2011-08-21

    Updated Norwegian bokmål translation

 po/nb.po | 1416 ++++++++++++++++++++------------------------------------------
 1 files changed, 442 insertions(+), 974 deletions(-)

commit b1b55414202ec25f4961c281098e092b80eda650
Author: Aron Xu <aronxu@gnome.org>
Date:   2011-08-21

    Update Simplified Chinese translation.

 po/zh_CN.po | 1750 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 812 insertions(+), 938 deletions(-)

commit 7edde17ac3c5949bd86d4961304fc6836fdad654
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   2011-08-21

    Updated Spanish translation

 po/es.po | 1827 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 860 insertions(+), 967 deletions(-)

commit bbfa1e7b9c831c92082f27a8df354081b70b5d7d
Author: Andika Triwidada <andika@gmail.com>
Date:   2011-08-20

    Updated Indonesian translation

 po/id.po | 1686 ++++++++++++++++++++------------------------------------------
 1 files changed, 551 insertions(+), 1135 deletions(-)

commit 4d6338a3ee0b85e4d99ab8b1469930ebc7934c64
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-20

    Move all the egg stuff into the libegg directory.
    
     * Janitorial duties.

 libegg/Makefile.am       |   13 ++-
 libegg/eggtreemultidnd.c |  415 ++++++++++++++++++++++++++++++++++++++++++++++
 libegg/eggtreemultidnd.h |   74 ++++++++
 src/Makefile.am          |    2 +-
 src/eggtreemultidnd.c    |  415 ----------------------------------------------
 src/eggtreemultidnd.h    |   74 --------
 6 files changed, 502 insertions(+), 491 deletions(-)

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

    Move stuff in the common/ subdirectory into libseahorse/
    
     * There wasn't really that much of a difference between the code.
       In theory it was supposed to be usable without depending on
       other bits of seahorse, but this was an arbitrary distinction.

 Makefile.am                           |    1 -
 common/.gitignore                     |    3 -
 common/Makefile.am                    |   15 -
 common/seahorse-bind.c                |  543 ---------------------------------
 common/seahorse-bind.h                |   43 ---
 common/seahorse-cleanup.c             |   86 ------
 common/seahorse-cleanup.h             |   33 --
 common/seahorse-object-list.c         |   84 -----
 common/seahorse-object-list.h         |   42 ---
 common/seahorse-registry.c            |  409 -------------------------
 common/seahorse-registry.h            |   86 ------
 common/seahorse-secure-buffer.c       |  196 ------------
 common/seahorse-secure-buffer.h       |   57 ----
 configure.ac                          |    1 -
 gkr/Makefile.am                       |    3 +-
 gkr/seahorse-gkr-add-item.c           |    3 +-
 gkr/seahorse-gkr-item-commands.c      |    3 +-
 gkr/seahorse-gkr-item-properties.c    |    5 +-
 gkr/seahorse-gkr-keyring-commands.c   |    3 +-
 gkr/seahorse-gkr-keyring-properties.c |    3 +-
 gkr/seahorse-gkr-source.c             |    7 +-
 libseahorse/Makefile.am               |   10 +-
 libseahorse/seahorse-bind.c           |  543 +++++++++++++++++++++++++++++++++
 libseahorse/seahorse-bind.h           |   43 +++
 libseahorse/seahorse-cleanup.c        |   86 ++++++
 libseahorse/seahorse-cleanup.h        |   33 ++
 libseahorse/seahorse-context.c        |    5 +-
 libseahorse/seahorse-object-list.c    |   84 +++++
 libseahorse/seahorse-object-list.h    |   42 +++
 libseahorse/seahorse-object-model.c   |    3 +-
 libseahorse/seahorse-passphrase.c     |    7 +-
 libseahorse/seahorse-passphrase.h     |    2 +
 libseahorse/seahorse-prefs.c          |    3 +-
 libseahorse/seahorse-registry.c       |  409 +++++++++++++++++++++++++
 libseahorse/seahorse-registry.h       |   86 ++++++
 libseahorse/seahorse-secure-buffer.c  |  196 ++++++++++++
 libseahorse/seahorse-secure-buffer.h  |   57 ++++
 libseahorse/seahorse-servers.c        |    3 +-
 libseahorse/seahorse-source.c         |    3 +-
 libseahorse/seahorse-unknown-source.c |    3 +-
 pgp/Makefile.am                       |    3 +-
 pgp/seahorse-gpgme-generate.c         |   10 +-
 pgp/seahorse-gpgme-key-op.c           |    3 +-
 pgp/seahorse-gpgme-key.c              |    3 +-
 pgp/seahorse-gpgme-source.c           |    3 +-
 pgp/seahorse-gpgme-uid.c              |    2 +-
 pgp/seahorse-hkp-source.c             |    5 +-
 pgp/seahorse-ldap-source.c            |    5 +-
 pgp/seahorse-pgp-commands.c           |    3 +-
 pgp/seahorse-pgp-key-properties.c     |    3 +-
 pgp/seahorse-pgp-key.c                |    5 +-
 pgp/seahorse-pgp-uid.c                |    2 +-
 pgp/seahorse-server-source.c          |    8 +-
 pkcs11/seahorse-pkcs11-commands.c     |    3 +-
 pkcs11/seahorse-pkcs11-operations.c   |    2 +-
 pkcs11/seahorse-pkcs11-source.c       |    2 +-
 src/Makefile.am                       |    1 -
 src/seahorse-generate-select.c        |    4 +-
 src/seahorse-main.c                   |    7 +-
 src/seahorse-viewer.c                 |    4 +-
 ssh/seahorse-ssh-commands.c           |    3 +-
 ssh/seahorse-ssh-generate.c           |    8 +-
 ssh/seahorse-ssh-key-properties.c     |    3 +-
 ssh/seahorse-ssh-source.c             |    3 +-
 64 files changed, 1646 insertions(+), 1693 deletions(-)

commit 3750c6e6926222301d67988c1f0c68429a1e4a70
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-20

    Fix up copyrights for recent big async refactoring.
    
     * This work was done while working for Collabora, so the
       copyright should reflect that.

 gkr/seahorse-gkr-add-keyring.c        |    1 +
 gkr/seahorse-gkr-item-commands.c      |    3 ++-
 gkr/seahorse-gkr-item-properties.c    |    1 +
 gkr/seahorse-gkr-item.c               |    1 +
 gkr/seahorse-gkr-item.h               |    1 +
 gkr/seahorse-gkr-keyring-commands.c   |    3 ++-
 gkr/seahorse-gkr-keyring.c            |    3 ++-
 gkr/seahorse-gkr-operation.c          |    1 +
 gkr/seahorse-gkr-operation.h          |    1 +
 gkr/seahorse-gkr-source.c             |    1 +
 libseahorse/seahorse-commands.c       |    3 ++-
 libseahorse/seahorse-commands.h       |    3 ++-
 libseahorse/seahorse-context.c        |    1 +
 libseahorse/seahorse-context.h        |    1 +
 libseahorse/seahorse-object.c         |    3 ++-
 libseahorse/seahorse-object.h         |    3 ++-
 libseahorse/seahorse-passphrase.c     |    1 +
 libseahorse/seahorse-progress.c       |    1 +
 libseahorse/seahorse-source.c         |    1 +
 libseahorse/seahorse-source.h         |    1 +
 libseahorse/seahorse-transfer.c       |    1 +
 libseahorse/seahorse-transfer.h       |    1 +
 libseahorse/seahorse-unknown-source.c |    1 +
 libseahorse/seahorse-unknown-source.h |    1 +
 libseahorse/seahorse-util.c           |    1 +
 libseahorse/seahorse-util.h           |    1 +
 pgp/seahorse-gpgme-generate.c         |    1 +
 pgp/seahorse-gpgme-key-op.c           |    1 +
 pgp/seahorse-gpgme-key.c              |    1 +
 pgp/seahorse-gpgme-source.c           |    1 +
 pgp/seahorse-gpgme.c                  |    3 ++-
 pgp/seahorse-gpgme.h                  |    3 ++-
 pgp/seahorse-hkp-source.c             |    1 +
 pgp/seahorse-ldap-source.c            |    1 +
 pgp/seahorse-pgp-commands.c           |    3 ++-
 pgp/seahorse-pgp-commands.h           |    3 ++-
 pgp/seahorse-pgp-key-properties.c     |    1 +
 pgp/seahorse-server-source.c          |    1 +
 pgp/seahorse-server-source.h          |    1 +
 pgp/seahorse-signer.c                 |    1 +
 pkcs11/seahorse-pkcs11-certificate.c  |    3 ++-
 pkcs11/seahorse-pkcs11-commands.c     |    3 ++-
 pkcs11/seahorse-pkcs11-object.c       |    3 ++-
 pkcs11/seahorse-pkcs11-operations.c   |    3 ++-
 pkcs11/seahorse-pkcs11-operations.h   |    3 ++-
 pkcs11/seahorse-pkcs11-source.c       |    1 +
 src/seahorse-key-manager-store.c      |    1 +
 src/seahorse-key-manager.c            |    3 ++-
 src/seahorse-keyserver-results.c      |    3 ++-
 src/seahorse-keyserver-results.h      |    3 ++-
 src/seahorse-keyserver-search.c       |    1 +
 src/seahorse-keyserver-sync.c         |    1 +
 src/seahorse-viewer.c                 |    3 ++-
 ssh/seahorse-ssh-commands.c           |    3 ++-
 ssh/seahorse-ssh-commands.h           |    3 ++-
 ssh/seahorse-ssh-generate.c           |    1 +
 ssh/seahorse-ssh-key-properties.c     |    1 +
 ssh/seahorse-ssh-key.c                |    1 +
 ssh/seahorse-ssh-key.h                |    1 +
 ssh/seahorse-ssh-operation.c          |    1 +
 ssh/seahorse-ssh-operation.h          |    1 +
 ssh/seahorse-ssh-source.c             |    1 +
 ssh/seahorse-ssh-source.h             |    1 +
 ssh/seahorse-ssh-upload.c             |    1 +
 64 files changed, 86 insertions(+), 22 deletions(-)

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

    Update POTFILES.in for recent changes.

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

commit 5ad63bb99ff81865cfdfddea2a8ecdbe5dc22fe4
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-20

    Remove unused unix signal code.

 libseahorse/Makefile.am            |    1 -
 libseahorse/seahorse-unix-signal.c |  143 ------------------------------------
 libseahorse/seahorse-unix-signal.h |   35 ---------
 3 files changed, 0 insertions(+), 179 deletions(-)

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

    More fixes for new async operation code.

 libseahorse/seahorse-util.c  |    4 ++--
 pgp/seahorse-gpgme.c         |    3 +--
 ssh/seahorse-ssh-operation.c |   11 ++++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

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

    Refactor asynchronous operation code in seahorse.
    
     * This is a very large commit.
     * We use GIO style async now instead of SeahorseOperation.
     * Makes things easier to hack on because it's more consistent with
       other GNOME software.
     * More predictable cancellation and error code paths.
     * Some other cleanup here too. When rewriting entire functions to
       refactor the async code, I cleaned up some other things too.

 configure.ac                              |    2 +-
 gkr/seahorse-gkr-add-item.c               |   15 +-
 gkr/seahorse-gkr-add-keyring.c            |   15 +-
 gkr/seahorse-gkr-item-commands.c          |   48 +-
 gkr/seahorse-gkr-item-properties.c        |  409 ++-----
 gkr/seahorse-gkr-item-properties.xml      |  153 ---
 gkr/seahorse-gkr-item.c                   |  106 +--
 gkr/seahorse-gkr-item.h                   |    5 -
 gkr/seahorse-gkr-keyring-commands.c       |   72 +-
 gkr/seahorse-gkr-keyring.c                |  445 +++----
 gkr/seahorse-gkr-operation.c              |  618 ++++++---
 gkr/seahorse-gkr-operation.h              |   64 +-
 gkr/seahorse-gkr-source.c                 |  495 +++----
 libseahorse/Makefile.am                   |    3 +-
 libseahorse/seahorse-commands.c           |   22 +-
 libseahorse/seahorse-commands.h           |   12 +-
 libseahorse/seahorse-context.c            |  740 ++++++-----
 libseahorse/seahorse-context.h            |  193 ++--
 libseahorse/seahorse-object.c             |   22 -
 libseahorse/seahorse-object.h             |    4 -
 libseahorse/seahorse-operation.c          |  937 -------------
 libseahorse/seahorse-operation.h          |  336 -----
 libseahorse/seahorse-passphrase.c         |   21 -
 libseahorse/seahorse-progress.c           |  913 ++++++++-----
 libseahorse/seahorse-progress.h           |   47 +-
 libseahorse/seahorse-progress.xml         |   89 +-
 libseahorse/seahorse-source.c             |  549 ++++----
 libseahorse/seahorse-source.h             |  218 ++--
 libseahorse/seahorse-transfer-operation.c |  382 ------
 libseahorse/seahorse-transfer-operation.h |   61 -
 libseahorse/seahorse-transfer.c           |  204 +++
 libseahorse/seahorse-transfer.h           |   37 +
 libseahorse/seahorse-unknown-source.c     |  111 +-
 libseahorse/seahorse-unknown-source.h     |    4 +-
 libseahorse/seahorse-unknown.c            |   14 +-
 libseahorse/seahorse-util.c               |   59 +-
 libseahorse/seahorse-util.h               |    6 +-
 pgp/Makefile.am                           |    1 -
 pgp/seahorse-gpg-options.c                |    4 +-
 pgp/seahorse-gpgme-generate.c             |   75 +-
 pgp/seahorse-gpgme-key-op.c               |  240 +++--
 pgp/seahorse-gpgme-key-op.h               |   12 +-
 pgp/seahorse-gpgme-key.c                  |   33 +-
 pgp/seahorse-gpgme-operation.c            |  438 ------
 pgp/seahorse-gpgme-operation.h            |   94 --
 pgp/seahorse-gpgme-photos.c               |    6 +-
 pgp/seahorse-gpgme-source.c               | 1488 +++++++++++----------
 pgp/seahorse-gpgme.c                      |  309 ++++-
 pgp/seahorse-gpgme.h                      |    6 +-
 pgp/seahorse-hkp-source.c                 | 1056 +++++++--------
 pgp/seahorse-ldap-source.c                | 1956 ++++++++++++++-------------
 pgp/seahorse-pgp-commands.c               |   48 +-
 pgp/seahorse-pgp-commands.h               |    2 -
 pgp/seahorse-pgp-generate.xml             |    2 +-
 pgp/seahorse-pgp-key-properties.c         |   36 +-
 pgp/seahorse-server-source.c              |  121 +--
 pgp/seahorse-server-source.h              |    8 +-
 pgp/seahorse-signer.c                     |    1 -
 pkcs11/seahorse-pkcs11-certificate.c      |    2 +-
 pkcs11/seahorse-pkcs11-commands.c         |   45 +-
 pkcs11/seahorse-pkcs11-object.c           |   11 +-
 pkcs11/seahorse-pkcs11-operations.c       |  492 +++-----
 pkcs11/seahorse-pkcs11-operations.h       |   19 +-
 pkcs11/seahorse-pkcs11-source.c           |   23 +-
 src/seahorse-key-manager-store.c          |   78 +-
 src/seahorse-key-manager.c                |   79 +-
 src/seahorse-keyserver-results.c          |   57 +-
 src/seahorse-keyserver-results.h          |    8 +-
 src/seahorse-keyserver-results.xml        |    2 +-
 src/seahorse-keyserver-search.c           |   15 +-
 src/seahorse-keyserver-sync.c             |  181 ++--
 src/seahorse-viewer.c                     |  158 +--
 ssh/seahorse-ssh-commands.c               |   29 +-
 ssh/seahorse-ssh-commands.h               |    2 -
 ssh/seahorse-ssh-generate.c               |  105 +-
 ssh/seahorse-ssh-generate.xml             |    2 +-
 ssh/seahorse-ssh-key-properties.c         |  215 ++--
 ssh/seahorse-ssh-key.c                    |   48 +-
 ssh/seahorse-ssh-key.h                    |   12 +-
 ssh/seahorse-ssh-operation.c              | 2117 ++++++++++++++++-------------
 ssh/seahorse-ssh-operation.h              |  126 +-
 ssh/seahorse-ssh-source.c                 |  935 +++++++------
 ssh/seahorse-ssh-source.h                 |    4 +-
 ssh/seahorse-ssh-upload.c                 |   92 +-
 84 files changed, 8339 insertions(+), 9885 deletions(-)

commit e7ad0d5a9bb4aef9df25368b064f0dcf703da10c
Merge: 013f7bc 30b03db
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-12

    Merge branch 'no-gslist'

commit 013f7bce424ac7f2c18a6406fd0b6fa4848615ab
Merge: 3cfa67d d6b5e2e
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-02

    Merge branch 'gsettings'

commit 3cfa67d2abaf2e9408782f20462c72175b96696a
Author: Mario Blättermann <mariobl@gnome.org>
Date:   2011-08-01

    [l10n] Updated German doc translation

 help/de/de.po |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

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

    pkcs11: Fix pkcs11 module initialization
    
     * Fix to match changes in new gck library.
     * GCK changed API and incremented its major version.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655539

 pkcs11/seahorse-pkcs11-module.c |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

commit 30b03db09d4a97de46456da557f5a8f1b8e5c401
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-28

    Remove unused functions.
    
     * Remove a bunch of unused or little used functions from
       seahorse-util.[ch]

 libseahorse/seahorse-transfer-operation.c |    2 +-
 libseahorse/seahorse-util.c               |  311 +----------------------------
 libseahorse/seahorse-util.h               |   42 +----
 src/seahorse-key-manager-store.c          |    2 +-
 src/seahorse-key-manager.c                |    3 +-
 src/seahorse-viewer.c                     |    4 +-
 6 files changed, 13 insertions(+), 351 deletions(-)

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

    Don't use GSList unless necessary
    
     * Use GList where lists are necessary.
     * Use gchar ** for string lists.

 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 |   14 ++--
 libseahorse/seahorse-transfer-operation.h |    2 +-
 libseahorse/seahorse-util.c               |  139 -----------------------------
 libseahorse/seahorse-util.h               |   16 +---
 pgp/seahorse-hkp-source.c                 |   30 ++++---
 pgp/seahorse-ldap-source.c                |  130 +++++++++++++-------------
 pgp/seahorse-pgp-key-properties.c         |   24 +++---
 pkcs11/seahorse-pkcs11-module.c           |    2 +-
 src/eggtreemultidnd.c                     |   14 ++--
 src/seahorse-keyserver-sync.c             |    6 +-
 24 files changed, 281 insertions(+), 435 deletions(-)

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

    Remove last references to gconf, including dependencies.
    
     * Remove dependencies from configure.ac
     * And remove lots of comments referring to gconf

 configure.ac                             |    3 +--
 libseahorse/seahorse-context.c           |    1 -
 libseahorse/seahorse-keyserver-control.h |    2 +-
 libseahorse/seahorse-prefs.c             |    2 +-
 pgp/seahorse-hkp-source.c                |    9 +--------
 pgp/seahorse-pgp-key-properties.c        |    2 +-
 src/seahorse-key-manager.c               |    2 +-
 src/seahorse-keyserver-search.c          |    4 ++--
 8 files changed, 8 insertions(+), 17 deletions(-)

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

    Fix the org.gnome.seahorse.manager gconf -> gsettings convert file
    
     * Had the wrong schema name.

 data/org.gnome.seahorse.manager.convert |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 140bfe64528ae740b7d372a5d8c23439de2ac864
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-07-27

    Port to GSettings instead of GConf
    
     * Depends on recent change in gnome-keyring schemas.
     * Some minor fixes and cleanup along with the gsettings port.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=622401

 .gitignore                                  |    1 +
 configure.ac                                |    6 +-
 data/Makefile.am                            |   32 +--
 data/org.gnome.seahorse.convert             |    6 +
 data/org.gnome.seahorse.gschema.xml         |   29 ++
 data/org.gnome.seahorse.manager.convert     |    6 +
 data/org.gnome.seahorse.manager.gschema.xml |   29 ++
 data/org.gnome.seahorse.window.gschema.xml  |   14 +
 data/seahorse.schemas.in                    |  211 -------------
 libseahorse/Makefile.am                     |    2 -
 libseahorse/seahorse-add-keyserver.xml      |    3 +-
 libseahorse/seahorse-check-button-control.c |   63 ----
 libseahorse/seahorse-check-button-control.h |   34 --
 libseahorse/seahorse-combo-keys.c           |    1 -
 libseahorse/seahorse-context.c              |  291 +++++++++---------
 libseahorse/seahorse-context.h              |    4 +
 libseahorse/seahorse-dns-sd.c               |   64 ++---
 libseahorse/seahorse-dns-sd.h               |    6 +-
 libseahorse/seahorse-gconf.c                |  439 ---------------------------
 libseahorse/seahorse-gconf.h                |   85 -----
 libseahorse/seahorse-keyserver-control.c    |  178 +++++------
 libseahorse/seahorse-keyserver-control.h    |   11 +-
 libseahorse/seahorse-prefs.c                |  218 ++++++--------
 libseahorse/seahorse-servers.c              |   63 ++--
 libseahorse/seahorse-servers.h              |    5 +-
 libseahorse/seahorse-set.c                  |   25 +-
 libseahorse/seahorse-util.c                 |    1 -
 libseahorse/seahorse-widget.c               |  129 +++-----
 libseahorse/seahorse-widget.h               |    1 +
 pgp/seahorse-gpgme-sign.c                   |    3 +-
 pgp/seahorse-hkp-source.c                   |  116 +++++---
 pgp/seahorse-pgp-key-properties.c           |    1 -
 pgp/seahorse-pgp-keysets.c                  |   18 +-
 pgp/seahorse-signer.c                       |   12 +-
 pkcs11/seahorse-pkcs11-module.c             |   13 +-
 src/seahorse-key-manager-store.c            |  179 ++++++------
 src/seahorse-key-manager-store.h            |    3 +-
 src/seahorse-key-manager.c                  |   69 ++---
 src/seahorse-keyserver-results.c            |   12 +-
 src/seahorse-keyserver-search.c             |  429 +++++++++++++-------------
 src/seahorse-keyserver-sync.c               |  113 ++++----
 src/seahorse-preferences.c                  |    2 -
 42 files changed, 1067 insertions(+), 1860 deletions(-)

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

    Add Glib style debug messages
    
     * This allows use of the SEAHORSE_DEBUG="all" environment variable.
     * Use SEAHORSE_DEBUG="help" to figure out what flags are available

 configure.ac                              |    2 +-
 gkr/seahorse-gkr-operation.c              |   14 ----
 gkr/seahorse-gkr-source.c                 |   17 -----
 libseahorse/Makefile.am                   |    1 +
 libseahorse/seahorse-debug.c              |  112 +++++++++++++++++++++++++++++
 libseahorse/seahorse-debug.h              |   91 +++++++++++++++++++++++
 libseahorse/seahorse-dns-sd.c             |   22 +-----
 libseahorse/seahorse-operation.c          |   42 ++++-------
 libseahorse/seahorse-transfer-operation.c |   53 ++++++--------
 libseahorse/seahorse-util.h               |    6 --
 pgp/seahorse-gpgme-key-op.c               |   58 ++++++---------
 pgp/seahorse-gpgme-operation.c            |   57 ++++++---------
 pgp/seahorse-gpgme-source.c               |   32 +++------
 pgp/seahorse-hkp-source.c                 |   31 +++-----
 pgp/seahorse-ldap-source.c                |   55 ++++++--------
 pgp/seahorse-pgp-key-properties.c         |    9 ++-
 src/seahorse-key-manager-store.c          |   39 ++++++-----
 ssh/seahorse-ssh-operation.c              |   83 +++++++++------------
 ssh/seahorse-ssh-source.c                 |   31 ++------
 19 files changed, 405 insertions(+), 350 deletions(-)

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

    Debug changes and fixes
    
     * Use --enable-debug=yes to enable passive debug message code (default).
     * Use --disable-debug to disable all debug code.
     * Use --enable-debug=full to enable debug compilation and extras.

 configure.ac                         |   40 ++++++++++++++++++++++------------
 gkr/seahorse-gkr-add-item.c          |    5 +--
 gkr/seahorse-gkr-dialogs.c           |    3 +-
 gkr/seahorse-gkr-keyring-commands.c  |    6 -----
 libegg/egg-datetime.c                |   19 +++++++++------
 libseahorse/seahorse-commands.c      |   17 --------------
 libseahorse/seahorse-context.c       |   19 ----------------
 libseahorse/seahorse-object-widget.c |    6 +---
 libseahorse/seahorse-passphrase.c    |    3 --
 libseahorse/seahorse-util.c          |    2 +-
 pgp/seahorse-gpg-options.c           |    4 +--
 pgp/seahorse-gpgme-source.c          |    5 ----
 pgp/seahorse-pgp-key-properties.c    |    9 +------
 pgp/seahorse-server-source.c         |    7 +-----
 ssh/seahorse-ssh-askpass.c           |    6 ++--
 15 files changed, 50 insertions(+), 101 deletions(-)

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

    Bump version number

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