[git] Pinentry - branch, master, updated. pinentry-1.0.0-22-gf69dadc

[by Damien Goutte-Gattat]

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  f69dadc6ccea7672869436291ab5c1f58d545466 (commit)
       via  8fbdf99d3a4f72d59b7cda7149793044635a1655 (commit)
      from  4101806bf73caf25c8ce4e455b154901da1fe788 (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 f69dadc6ccea7672869436291ab5c1f58d545466
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Wed Jul 5 11:22:46 2017 +0200

    gtk: Always set the window as transient.
    
    * gtk+-2/pinentry-gtk-2.c (create_window): Setup the make_transient
    callback whether we ask for a passphrase or not.
    --
    
    Making the window transient seems necessary for (at least some)
    tiling window managers to make sure the dialog is floating.
    
    GnuPG-bug-id: 3253
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index dee0360..d467ec5 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -113,9 +113,9 @@ constrain_size (GtkWidget *win, GtkRequisition *req, gpointer data)
 }
 
 
-/* Realize the window as transient if we grab the keyboard.  This
-   makes the window a modal dialog to the root window, which helps the
-   window manager.  See the following quote from:
+/* Realize the window as transient.  This makes the window a modal
+   dialog to the root window, which helps the window manager.
+   See the following quote from:
    https://standards.freedesktop.org/wm-spec/wm-spec-1.4.html#id2512420
 
    Implementing enhanced support for application transient windows
@@ -586,12 +586,12 @@ create_window (pinentry_t ctx)
 #endif
   g_signal_connect (G_OBJECT (win), "size-request",
 		    G_CALLBACK (constrain_size), NULL);
+
+  g_signal_connect (G_OBJECT (win),
+		    "realize", G_CALLBACK (make_transient), NULL);
+
   if (!confirm_mode)
     {
-      if (pinentry->grab)
-	g_signal_connect (G_OBJECT (win),
-			  "realize", G_CALLBACK (make_transient), NULL);
-
       /* We need to grab the keyboard when its visible! not when its
          mapped (there is a difference)  */
       g_object_set (G_OBJECT(win), "events",

commit 8fbdf99d3a4f72d59b7cda7149793044635a1655
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Feb 22 18:43:50 2017 +0100

    core: Add example on how to print a FEATURES line.
    
    --

diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 517a033..0d889a6 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1624,6 +1624,8 @@ cmd_getinfo (assuan_context_t ctx, char *line)
                 flavor_flag? flavor_flag : "");
       buffer[sizeof buffer -1] = 0;
       rc = assuan_send_data (ctx, buffer, strlen (buffer));
+      /* if (!rc) */
+      /*   rc = assuan_write_status (ctx, "FEATURES", "tabbing foo bar"); */
     }
   else if (!strcmp (line, "ttyinfo"))
     {

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

Summary of changes:
 gtk+-2/pinentry-gtk-2.c | 14 +++++++-------
 pinentry/pinentry.c     |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)


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