[gnome-keyring: 3/3] Merge branch 'gnupg-process'
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring: 3/3] Merge branch 'gnupg-process'
- Date: Tue, 12 Jul 2011 10:56:21 +0000 (UTC)
commit 73e11d9b3bc2680b90ec8ab1c10bcc7ba8524f50
Merge: 20b7ec0 e2ca61d
Author: Stef Walter <stefw collabora co uk>
Date: Tue Jul 12 12:55:57 2011 +0200
Merge branch 'gnupg-process'
.gitignore | 1 +
docs/reference/gcr/gcr-sections.txt | 12 +-
gcr/Makefile.am | 1 +
gcr/gcr-gnupg-collection.c | 164 ++---
gcr/gcr-gnupg-collection.h | 10 +-
gcr/gcr-gnupg-process.c | 921 ++++++++++++++++++++
gcr/gcr-gnupg-process.h | 89 ++
gcr/gcr-marshal.list | 2 +
gcr/tests/Makefile.am | 3 +-
gcr/tests/files/gnupg-mock/mock-arguments-environ | 22 +
gcr/tests/files/gnupg-mock/mock-fail-exit | 6 +
gcr/tests/files/gnupg-mock/mock-fail-signal | 8 +
gcr/tests/files/gnupg-mock/mock-simple-error | 9 +
gcr/tests/files/gnupg-mock/mock-simple-output | 8 +
.../files/gnupg-mock/mock-status-and-attribute | 34 +
gcr/tests/files/gnupg-mock/mock-status-and-output | 24 +
gcr/tests/files/gnupg-mock/mock-with-homedir | 22 +
gcr/tests/test-gnupg-collection.c | 1 -
gcr/tests/test-gnupg-process.c | 535 ++++++++++++
19 files changed, 1762 insertions(+), 110 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]