[git] Pinentry - branch, master, updated. pinentry-0.9.4-7-g34f3cdb

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  34f3cdbf5aa0b7b8647a3bcedef7e1a51746b5ed (commit)
       via  34539f97a6ddc552295b5cb64676eee9dab5bd30 (commit)
       via  56fe7ef451ee473407b7dc604e3d73a6a5771c5d (commit)
      from  302903f76b8d62b1e07219a203f7219cb3aff7d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 34f3cdbf5aa0b7b8647a3bcedef7e1a51746b5ed
Author: Neal H. Walfield <neal at gnu.org>
Date:   Tue Jun 16 12:52:46 2015 +0200

    If we fail to initialize gtk, fallback to the curses frontend.
    
    * gnome3/pinentry-gnome3.c (main): Use gtk_init_check instead of
    gtk_init.  If it fails, fallback to the curses frontend.

diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
index 2799904..8f91cb8 100644
--- a/gnome3/pinentry-gnome3.c
+++ b/gnome3/pinentry-gnome3.c
@@ -262,7 +262,10 @@ main (int argc, char *argv[])
 
 #ifdef FALLBACK_CURSES
   if (pinentry_have_display (argc, argv))
-    gtk_init (&argc, &argv);
+    {
+      if (! gtk_init_check (&argc, &argv))
+	pinentry_cmd_handler = curses_cmd_handler;
+    }
   else
     pinentry_cmd_handler = curses_cmd_handler;
 #else

commit 34539f97a6ddc552295b5cb64676eee9dab5bd30
Author: Neal H. Walfield <neal at gnu.org>
Date:   Tue Jun 16 12:18:06 2015 +0200

    Fix comment for pinentry_cmd_handler_t.
    
    * pinentry/pinentry.h (pinentry_cmd_handler_t): Fix comment.

diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h
index a5882bf..abcc3a5 100644
--- a/pinentry/pinentry.h
+++ b/pinentry/pinentry.h
@@ -202,7 +202,7 @@ typedef struct pinentry *pinentry_t;
    entry.  On confirmation, the function should return TRUE if
    confirmed, and FALSE otherwise.  On PIN entry, the function should
    return -1 if an error occured or the user cancelled the operation
-   and the length of the secret otherwise.  */
+   and 1 otherwise.  */
 typedef int (*pinentry_cmd_handler_t) (pinentry_t pin);
 
 /* Start the pinentry event loop.  The program will start to process

commit 56fe7ef451ee473407b7dc604e3d73a6a5771c5d
Author: Neal H. Walfield <neal at gnu.org>
Date:   Tue Jun 16 12:17:32 2015 +0200

    Describe default-prompt in the implementation section of the manual.
    
    * doc/pinentry.texi (Implementation Details): Describe default-prompt.

diff --git a/doc/pinentry.texi b/doc/pinentry.texi
index 154e61a..90902bd 100644
--- a/doc/pinentry.texi
+++ b/doc/pinentry.texi
@@ -552,9 +552,17 @@ again prompt the user.  In this case, this variable contains a
 description of the error message.  This text should typically be
 highlighted in someway.
 
- at item @code{prompt}
+ at item @code{prompt}, @code{default-prompt}
 The string to associate with the passphrase entry box.
 
+There is a subtle difference between @code{prompt} and
+ at code{default-prompt}.  @code{default-prompt} means that a stylized
+prompt (e.g., an icon suggesting a prompt) may be used.  @code{prompt}
+means that the entry's meaning is not consistent with such a style
+and, as such, no icon should be used.
+
+If both variables are set, the @code{prompt} variant takes precedence.
+
 @item @code{repeat_passphrase}
 The string to associate with the second passphrase entry box.  The
 second passphrase entry box should only be shown if this is not

-----------------------------------------------------------------------

Summary of changes:
 doc/pinentry.texi        | 10 +++++++++-
 gnome3/pinentry-gnome3.c |  5 ++++-
 pinentry/pinentry.h      |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org