commit dd728dd8e13e8e4316e4613cc110919e4040ec77
Author: Stef Walter <stefw@gnome.org>
Date:   2012-10-22

    Release version 3.7.1

 NEWS                           | 7 +++++++
 configure.ac                   | 2 +-
 docs/reference/gcr/Makefile.am | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

commit 5e8d935108bffb22a3b822e2ee26bbd359b4e7d1
Merge: 3d3822f fd9997b
Author: Stef Walter <stefw@gnome.org>
Date:   2012-10-22

    Merge branch 'gnome-3-6'

commit 3d3822f590951e61d7d9c1aae6fa638a640f85f9
Author: Stef Walter <stefw@gnome.org>
Date:   2012-10-22

    gcr: In the frob-prompt tool delay during 'password checking' state
    
     * This is so we can better test the cancellation.

 gcr/tests/frob-prompt.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

commit f16948e98f6ad03d94dadc67ed9dc4078ac195ca
Author: Stef Walter <stefw@gnome.org>
Date:   2012-10-22

    gcr: Allow cancellation between ops in the GcrPromptDialog
    
     * Keep the cancel button enabled when in 'password checking' mode.

 gcr/gcr-prompt-dialog.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 064d7588d1272481b22e70ed2c3901e7673b23f7
Author: Stef Walter <stefw@gnome.org>
Date:   2012-08-20

    gcr: Cancel the prompt when prompter goes away
    
     * If the prompter quits, cancel any prompting that's going on.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684478

 gcr/gcr-base.symbols           |  1 +
 gcr/gcr-mock-prompter.c        | 36 +++++++++++++---
 gcr/gcr-mock-prompter.h        |  2 +
 gcr/gcr-system-prompt.c        | 95 +++++++++++++++++++++++++++++++++++++++---
 gcr/tests/test-system-prompt.c | 84 +++++++++++++++++++++++++++++++++++++
 5 files changed, 206 insertions(+), 12 deletions(-)

commit d042d43ae1f44c37334fd620ad1e5625f06aa88f
Author: Stef Walter <stefw@gnome.org>
Date:   2012-09-21

    gcr: Implement prompt-close in GcrSystemPrompt and GcrSystemPrompter
    
     * Properly relay the prompt-close signal from GcrSystemPrompter
       back to GcrSystemPrompt by firing the PromptDone callback method
       on the caller's DBus interface.
     * Make sure GcrSystemPrompt emits prompt-close appropriately for
       all the various paths that can close the prompt.
     * Add testing of the above, and changes in the mock prompter for this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678611

 docs/reference/gcr/gcr-sections.txt |   1 +
 gcr/gcr-base.symbols                |   1 +
 gcr/gcr-mock-prompter.c             |  44 ++++++++
 gcr/gcr-mock-prompter.h             |   2 +
 gcr/gcr-system-prompt.c             | 212 +++++++++++++++++++++---------------
 gcr/gcr-system-prompter.c           |  58 ++++++++--
 gcr/tests/frob-system-prompt.c      |   3 +
 gcr/tests/test-system-prompt.c      |  99 +++++++++++++++++
 8 files changed, 324 insertions(+), 96 deletions(-)

commit 930654b4bc985b733640ece9017133cb8c220b7b
Author: Stef Walter <stefw@gnome.org>
Date:   2012-09-21

    gcr: Implement prompt-close in GcrPromptDialog
    
     * When the dialog is closed, fire the prompt-close signal and
       close the dialog.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678611

 gcr/gcr-prompt-dialog.c | 52 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

commit 457348bccd3a8c7f76157549d86bc41fc3f1175c
Author: Stef Walter <stefw@gnome.org>
Date:   2012-09-21

    gcr: Add prompt-close action signal to GcrPrompt
    
     * This signal is fired when the prompt is closed, regardless of
       whether that closure was initiated by the user, or by the the
       application.
     * Add a gcr_prompt_close() method to fire this signal.
     * After closing a prompt the prompt should not display any further
       password or confirm prompts to the user.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678611

 docs/reference/gcr/gcr-sections.txt |  1 +
 gcr/gcr-base.symbols                |  1 +
 gcr/gcr-prompt.c                    | 41 +++++++++++++++++++++++++++++++++++++
 gcr/gcr-prompt.h                    |  4 ++++
 4 files changed, 47 insertions(+)

commit 1d1b5de8ffbf60e8d854148880ee81860fa0b6a9
Author: Stef Walter <stefw@gnome.org>
Date:   2012-09-21

    gcr: Remove the waiting field in the system prompt CallClosure
    
     * This field wasn't being used for anything.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678611

 gcr/gcr-system-prompt.c | 4 ----
 1 file changed, 4 deletions(-)

commit e9e301944401f7442b945eb00d8b7be5760fef67
Author: Stef Walter <stefw@gnome.org>
Date:   2012-09-21

    gcr: Always specify the context for 'running' prompts
    
     * Don't automatically use the thread context, unless that's what
       was passed to run_closure_begin().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678611

 gcr/gcr-prompt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2cd55348bedf2779076471fa972f8d26e8e0ffce
Author: Stef Walter <stefw@gnome.org>
Date:   2012-09-21

    gcr: Make the mock prompter's response handling more extensible
    
     * So that we can handle closing of prompts in later commits
     * Also makes it more predictable as to which context the response
       is sent from.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678611

 gcr/gcr-mock-prompter.c | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

commit ded634e529ea5b627d4eb7a319604e0a70dd5028
Author: Stef Walter <stefw@gnome.org>
Date:   2012-10-22

    Update for deprecations
    
     * Remove old version checks for new stable dependencies
     * g_type_init() has been deprecated in glib 2.35.0

 egg/egg-testing.c                   | 3 ++-
 gck/tests/test-gck-attributes.c     | 2 ++
 gck/tests/test-gck-crypto.c         | 2 ++
 gck/tests/test-gck-enumerator.c     | 2 ++
 gck/tests/test-gck-module.c         | 2 ++
 gck/tests/test-gck-modules.c        | 2 ++
 gck/tests/test-gck-object.c         | 2 ++
 gck/tests/test-gck-session.c        | 2 ++
 gck/tests/test-gck-slot.c           | 2 ++
 gck/tests/test-gck-uri.c            | 2 ++
 gcr/gcr-prompter-tool.c             | 2 ++
 gcr/gcr-unlock-renderer.c           | 2 --
 gcr/gcr-viewer-tool.c               | 2 ++
 gcr/tests/frob-parser.c             | 2 ++
 gcr/tests/test-certificate-chain.c  | 2 ++
 gcr/tests/test-certificate.c        | 2 ++
 gcr/tests/test-filter-collection.c  | 2 ++
 gcr/tests/test-fingerprint.c        | 2 ++
 gcr/tests/test-gnupg-collection.c   | 2 ++
 gcr/tests/test-gnupg-key.c          | 2 ++
 gcr/tests/test-gnupg-process.c      | 2 ++
 gcr/tests/test-memory-icon.c        | 2 ++
 gcr/tests/test-openpgp.c            | 2 ++
 gcr/tests/test-openssh.c            | 2 ++
 gcr/tests/test-parser.c             | 2 ++
 gcr/tests/test-pkcs11-certificate.c | 2 ++
 gcr/tests/test-record.c             | 2 ++
 gcr/tests/test-secret-exchange.c    | 2 ++
 gcr/tests/test-simple-certificate.c | 2 ++
 gcr/tests/test-subject-public-key.c | 2 ++
 gcr/tests/test-system-prompt.c      | 2 ++
 gcr/tests/test-trust.c              | 2 ++
 gcr/tests/test-util.c               | 2 ++
 33 files changed, 64 insertions(+), 3 deletions(-)