[seahorse-plugins: 4/4] Merge branch 'no-gpg-agent'

[Stefan Walter <stefw src gnome org>]

commit 7e114290f96700a3c4e06a1515d410beb06f4390
Merge: af0d239 1f6e9c0
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Feb 10 23:21:44 2011 +0100

    Merge branch 'no-gpg-agent'

 HACKING                                     |   18 -
 Makefile.am                                 |    9 +-
 agent/.gitignore                            |    6 -
 agent/Makefile.am                           |   36 --
 agent/seahorse-agent-actions.c              |  247 --------
 agent/seahorse-agent-cache.c                |  658 ---------------------
 agent/seahorse-agent-cache.xml              |  156 -----
 agent/seahorse-agent-io.c                   |  828 ---------------------------
 agent/seahorse-agent-main.c                 |  287 ---------
 agent/seahorse-agent-prompt.c               |  304 ----------
 agent/seahorse-agent-status.c               |  349 -----------
 agent/seahorse-agent.1                      |  111 ----
 agent/seahorse-agent.c                      |  168 ------
 agent/seahorse-agent.h                      |  135 -----
 configure.in                                |   29 -
 help/C/seahorse-plugins.xml                 |   55 --
 libseahorse/Makefile.am                     |    9 +-
 libseahorse/seahorse-passphrase.c           |  165 ------
 libseahorse/seahorse-passphrase.h           |    9 -
 libseahorse/seahorse-prefs-cache.c          |  278 ---------
 libseahorse/seahorse-prefs.c                |   11 -
 libseahorse/seahorse-prefs.xml              |  191 ------
 libseahorse/seahorse-secure-memory.h        |    2 +-
 plugins/nautilus/seahorse-pgp-preferences.c |   17 +-
 po/POTFILES.in                              |    8 -
 25 files changed, 4 insertions(+), 4082 deletions(-)
---