[PINENTRY PATCH] gnome3: Tighten up error messages when GNOME screensaver is absent.

[Neal H. Walfield]

Applied.  Thanks!

:) Neal

At Tue,  8 Nov 2016 14:37:25 -0600,
Daniel Kahn Gillmor wrote:
> 
> * 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>
> ---
>  gnome3/pinentry-gnome3.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> 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
> -- 
> 2.10.2
> 
> 
> _______________________________________________
> Gnupg-devel mailing list
> Gnupg-devel at gnupg.org
> http://lists.gnupg.org/mailman/listinfo/gnupg-devel
>