[virt-tools-list] [PATCH virt-viewer v2 1/5] Include virt-viewer-util where needed

[Fabiano Fidêncio]

On Mon, May 30, 2016 at 5:08 PM, Pavel Grunt <pgrunt at redhat.com> wrote:
> ---
>  src/remote-viewer-main.c | 1 +
>  src/remote-viewer.c      | 1 +
>  src/virt-viewer-app.h    | 1 -
>  src/virt-viewer-auth.c   | 1 +
>  src/virt-viewer-auth.h   | 1 -
>  src/virt-viewer-main.c   | 1 +
>  src/virt-viewer.c        | 1 +
>  7 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c
> index 4ed74fb..634991c 100644
> --- a/src/remote-viewer-main.c
> +++ b/src/remote-viewer-main.c
> @@ -28,6 +28,7 @@
>  #include <stdlib.h>
>
>  #include "remote-viewer.h"

remote-viewer.h includes virt-viewer-app.h, which includes virt-viewer-util.h

> +#include "virt-viewer-util.h"
>
>  int
>  main(int argc, char **argv)
> diff --git a/src/remote-viewer.c b/src/remote-viewer.c
> index f76350d..11b51e9 100644
> --- a/src/remote-viewer.c
> +++ b/src/remote-viewer.c
> @@ -44,6 +44,7 @@
>  #include "virt-viewer-auth.h"
>  #include "virt-viewer-file.h"
>  #include "virt-viewer-session.h"
> +#include "virt-viewer-util.h"
>  #include "remote-viewer.h"
>  #include "remote-viewer-connect.h"
>
> diff --git a/src/virt-viewer-app.h b/src/virt-viewer-app.h
> index 7f6c401..8381631 100644
> --- a/src/virt-viewer-app.h
> +++ b/src/virt-viewer-app.h
> @@ -25,7 +25,6 @@
>
>  #include <glib-object.h>
>  #include <gtk/gtk.h>
> -#include "virt-viewer-util.h"
>  #include "virt-viewer-window.h"

Hmm. So this patch is not only including virt-viewer-util.h whenever
itś needed. It's also removing from where it's not needed :-)

Would worth to mention that in the commit message and commit log.

>
>  G_BEGIN_DECLS
> diff --git a/src/virt-viewer-auth.c b/src/virt-viewer-auth.c
> index d08f2c0..03c27cf 100644
> --- a/src/virt-viewer-auth.c
> +++ b/src/virt-viewer-auth.c
> @@ -31,6 +31,7 @@
>  #endif
>
>  #include "virt-viewer-auth.h"
> +#include "virt-viewer-util.h"
>
>  static void
>  show_password(GtkCheckButton *check_button G_GNUC_UNUSED,
> diff --git a/src/virt-viewer-auth.h b/src/virt-viewer-auth.h
> index cdabd00..25463fc 100644
> --- a/src/virt-viewer-auth.h
> +++ b/src/virt-viewer-auth.h
> @@ -26,7 +26,6 @@
>  #include "config.h"
>
>  #include "virt-viewer-session.h"
> -#include "virt-viewer-util.h"

Same comment here about mentioning it in the commit log and commit message.

>
>  gboolean virt_viewer_auth_collect_credentials(GtkWindow *window,
>                                                const char *type,
> diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c
> index 56521f2..3a81350 100644
> --- a/src/virt-viewer-main.c
> +++ b/src/virt-viewer-main.c
> @@ -28,6 +28,7 @@
>  #include <stdlib.h>
>
>  #include "virt-viewer.h"
> +#include "virt-viewer-util.h"

And here it's needed because virt-viewer.h includes virt-viewer-app.h,
which doesn't include virt-viewer-util.h anymore.

>
>  int main(int argc, char **argv)
>  {
> diff --git a/src/virt-viewer.c b/src/virt-viewer.c
> index 1d03a14..173b0d3 100644
> --- a/src/virt-viewer.c
> +++ b/src/virt-viewer.c
> @@ -50,6 +50,7 @@
>  #include "virt-viewer-app.h"
>  #include "virt-viewer-vm-connection.h"
>  #include "virt-viewer-auth.h"
> +#include "virt-viewer-util.h"
>
>  struct _VirtViewerPrivate {
>      char *uri;
> --
> 2.8.3
>
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list

ACK the patch with the changes in the commit message and commit log.