[virt-tools-list] [PATCH virt-viewer] ovirt: Allow to cancel authentication without showing error dialog

[Pavel Grunt]

Hey,

> 
> Hey,
> 
> On Wed, Apr 08, 2015 at 09:22:37AM +0200, Pavel Grunt wrote:
> > diff --git a/configure.ac b/configure.ac
> > index 45b894d..f445b84 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -203,7 +203,18 @@ AS_IF([test "x$with_ovirt" != "xno"],
> >        [have_ovirt=no])
> >  
> >  AS_IF([test "x$have_ovirt" = "xyes"],
> > -      [AC_DEFINE([HAVE_OVIRT], 1, [Have libgovirt?])],
> > +      [AC_DEFINE([HAVE_OVIRT], 1, [Have libgovirt?])]
> > +      [SAVED_CFLAGS=$CFLAGS
> > +       SAVED_LIBS=$LIBS
> > +       CFLAGS=$OVIRT_CFLAGS
> > +       LIBS=$OVIRT_LIBS
> 
> 
> I don't know if the $xxx variables should be quoted with ""

You are right, they are quoted in similar cases.

> 
> > +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include
> > <govirt/govirt.h>]],
> > +        [static int err = OVIRT_REST_CALL_ERROR_CANCELLED;
> > +         void *fun = rest_proxy_auth_cancel;])],
> > +        [AC_DEFINE([HAVE_OVIRT_CANCEL], 1, [Have
> > rest_proxy_auth_cancel and OVIRT_REST_CALL_ERROR_CANCELLED?])],
> > +        [])
> > +       CFLAGS=$SAVED_CFLAGS
> > +       LIBS=$SAVED_LIBS],
> >        [AS_IF([test "x$with_ovirt" = "xyes"],
> >               [AC_MSG_ERROR([oVirt support requested but libgovirt
> >               not found])
> >        ])
> > diff --git a/src/remote-viewer.c b/src/remote-viewer.c
> > index b172056..67bb966 100644
> > --- a/src/remote-viewer.c
> > +++ b/src/remote-viewer.c
> > @@ -704,7 +704,7 @@ parse_ovirt_uri(const gchar *uri_str, char
> > **rest_uri, char **name, char **usern
> >  }
> >  
> >  static gboolean
> > -authenticate_cb(RestProxy *proxy, G_GNUC_UNUSED RestProxyAuth
> > *auth,
> > +authenticate_cb(RestProxy *proxy, RestProxyAuth *auth,
> >                  G_GNUC_UNUSED gboolean retrying, gpointer
> >                  user_data)
> 
> This triggers a warning about 'auth' being unused when
> HAVE_OVIRT_CANCEL
> is not defined. You could leave the G_GNUC_UNUSED annotation even
> when
> HAVE_OVIRT_CANCEL is defined as this is documented as
> "It is used for declaring functions and arguments which *may* never
> be
> used." (emphasis is mine)
> 
Fixed, thanks
>
> Apart from this, looks good, ACK.
> 
> Christophe
> 

Thanks,

Pavel