[git] Pinentry - branch, master, updated. pinentry-0.9.7-53-gcf8885f

[by Daniel Kahn Gillmor]

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  cf8885fd5a61654a164f470fa3e7095b8e424258 (commit)
      from  8f51108a17d0080c33fae182f1e4b9259f10a9e5 (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 cf8885fd5a61654a164f470fa3e7095b8e424258
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Nov 8 14:37:25 2016 -0600

    gnome3: Tighten up error messages when GNOME screensaver is absent.
    
    * gnome3/pinentry-gnome3.c (pe_gnome_screen_locked): clean up error
    messages when GNOME screensaver is absent or misbehaving.
    
    --
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
index f9c9262..a040f9b 100644
--- a/gnome3/pinentry-gnome3.c
+++ b/gnome3/pinentry-gnome3.c
@@ -446,9 +446,12 @@ pe_gnome_screen_locked (void)
   g_object_unref(dbus);
   if (!reply)
     {
-      fprintf (stderr, "failed to get reply (%d): %s",
-               error ? error->code : -1,
-               error ? error->message : "<no GError>");
+      /* G_IO_ERROR_TIMED_OUT is the expected response when there is
+       * no gnome screensaver at all, don't be noisy in that case: */
+      if (!(error && error->code == G_IO_ERROR_TIMED_OUT))
+        fprintf (stderr, "Failed to get d-bus reply for org.gnome.ScreenSaver.GetActive (%d): %s\n",
+                 error ? error->code : -1,
+                 error ? error->message : "<no GError>");
       if (error)
         g_error_free (error);
       return FALSE;
@@ -456,7 +459,7 @@ pe_gnome_screen_locked (void)
   reply_bool = g_variant_get_child_value (reply, 0);
   if (!reply_bool)
     {
-      fprintf (stderr, "failed to get boolean from reply\n");
+      fprintf (stderr, "Failed to get d-bus boolean from org.gnome.ScreenSaver.GetActive; assuming screensaver is not locked\n");
       ret = FALSE;
     }
   else

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

Summary of changes:
 gnome3/pinentry-gnome3.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


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