[seahorse: 4/4] Merge branch 'gsettings'

[Stefan Walter <stefw src gnome org>]

commit 013f7bce424ac7f2c18a6406fd0b6fa4848615ab
Merge: 3cfa67d d6b5e2e
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Aug 2 10:46:48 2011 +0200

    Merge branch 'gsettings'

 .gitignore                                  |    1 +
 configure.ac                                |    9 +-
 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              |  292 +++++++++---------
 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    |   13 +-
 libseahorse/seahorse-prefs.c                |  220 ++++++--------
 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                   |  125 +++++---
 pgp/seahorse-pgp-key-properties.c           |    3 +-
 pgp/seahorse-pgp-keysets.c                  |   18 +-
 pgp/seahorse-signer.c                       |   12 +-
 pkcs11/seahorse-pkcs11-module.c             |    1 -
 src/seahorse-key-manager-store.c            |  179 ++++++------
 src/seahorse-key-manager-store.h            |    3 +-
 src/seahorse-key-manager.c                  |   71 ++---
 src/seahorse-keyserver-results.c            |   12 +-
 src/seahorse-keyserver-search.c             |  433 +++++++++++++-------------
 src/seahorse-keyserver-sync.c               |  113 ++++----
 src/seahorse-preferences.c                  |    2 -
 42 files changed, 1070 insertions(+), 1870 deletions(-)
---