[gnome-keyring: 8/8] Merge branch 'gpg-agent'

[Stefan Walter <stefw src gnome org>]

commit ed1054ef7c9456b3c15a8c4f5600effbe075990d
Merge: 4d611ac 606b73f
Author: Stef Walter <stef memberwebs com>
Date:   Mon Jun 28 14:28:36 2010 +0000

    Merge branch 'gpg-agent'

 configure.in                                |   20 +
 daemon/.gitignore                           |    2 +
 daemon/Makefile.am                          |    6 +-
 daemon/gkd-glue.c                           |  110 ++++
 daemon/gkd-glue.h                           |   32 ++
 daemon/gkd-main.c                           |   30 +-
 daemon/gkd-pkcs11.c                         |    5 +-
 daemon/gnome-keyring-gpg.desktop.in.in      |   14 +
 daemon/gpg-agent/.gitignore                 |    1 +
 daemon/gpg-agent/Makefile.am                |   37 ++
 daemon/gpg-agent/gkd-gpg-agent-ops.c        |  797 +++++++++++++++++++++++++++
 daemon/gpg-agent/gkd-gpg-agent-private.h    |  117 ++++
 daemon/gpg-agent/gkd-gpg-agent-standalone.c |  127 +++++
 daemon/gpg-agent/gkd-gpg-agent.c            |  484 ++++++++++++++++
 daemon/gpg-agent/gkd-gpg-agent.h            |   40 ++
 po/POTFILES.in                              |    2 +
 po/POTFILES.skip                            |    1 +
 po/en shaw po                               |    1 -
 ui/gku-prompt.ui                            |   30 +-
 19 files changed, 1834 insertions(+), 22 deletions(-)
---
diff --cc po/POTFILES.skip
index 3438eb6,48e9c92..4230965
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@@ -1,7 -1,6 +1,8 @@@
  daemon/gnome-keyring-pkcs11.desktop.in
  daemon/gnome-keyring-secrets.desktop.in
  daemon/gnome-keyring-ssh.desktop.in
+ daemon/gnome-keyring-gpg.desktop.in
 +daemon/org.freedesktop.secrets.service.in
 +daemon/org.gnome.keyring.service.in
  gcr/gcr-import-dialog.ui
  gcr/gcr-certificate-basics-widget.ui