[git] Pinentry - branch, master, updated. pinentry-0.9.2-29-gedd9a88

[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  edd9a884604ff76e63d238504ede9b118655c55b (commit)
      from  d3c52a144b5b23d0d841a99a310090dcafe2074b (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 edd9a884604ff76e63d238504ede9b118655c55b
Author: Neal H. Walfield <neal at gnu.org>
Date:   Sat May 16 22:51:20 2015 +0200

    gtk+-2: If gtk fails to initialize, fallback to the curses backend.
    
    * gtk+-2/pinentry-gtk-2.c (main): Use gtk_init_check instead of
    gtk_init.  If gtk_init_check fails, fallback to the curses backend.
    
    --
    
    Reported-by: Daniel Kahn Gillmorr <dkg at fifthhorseman.net>.  Closes
    issue #1982.

diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index 1feecc2..e7b9acc 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -758,7 +758,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

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

Summary of changes:
 gtk+-2/pinentry-gtk-2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


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