[seahorse: 2/3] Merge branch 'no-sharing'

[Stefan Walter <stefw src gnome org>]

commit e3514baed3588f916048df4bfee901ab0829b64a
Merge: f5e2333 f55f0e3
Author: Stef Walter <stef memberwebs com>
Date:   Sun Oct 3 19:03:48 2010 +0000

    Merge branch 'no-sharing'

 daemon/Makefile.am                       |   10 +-
 daemon/seahorse-daemon.1                 |    3 +-
 daemon/seahorse-daemon.c                 |   15 -
 daemon/seahorse-daemon.h                 |   29 -
 daemon/seahorse-hkp-server.c             |  668 ------------------
 daemon/seahorse-sharing.c                |  348 ----------
 libseahorse/seahorse-gconf.h             |    2 -
 libseahorse/seahorse-gtkstock.c          |    1 -
 libseahorse/seahorse-gtkstock.h          |    1 -
 libseahorse/seahorse-prefs.c             |   26 -
 libseahorse/seahorse-prefs.xml           |   71 +--
 pixmaps/22x22/Makefile.am                |    2 -
 pixmaps/22x22/seahorse-share-keys.png    |  Bin 1127 -> 0 bytes
 pixmaps/22x22/seahorse-share-keys.svg    | 1091 ------------------------------
 pixmaps/48x48/Makefile.am                |    1 -
 pixmaps/48x48/seahorse-share-keys.png    |  Bin 2966 -> 0 bytes
 pixmaps/scalable/Makefile.am             |    1 -
 pixmaps/scalable/seahorse-share-keys.svg |  528 ---------------
 18 files changed, 4 insertions(+), 2793 deletions(-)
---