Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers

[Pavel Grunt]

On Wed, 2016-06-22 at 14:59 -0300, Eduardo Lima (Etrunko) wrote:
> This is not actually necessary as of C99. You only need to initialize
> any field of a structure to get all other fields initialized too.

yes, I was just annoyed by the warning..

> 
> On 06/22/2016 03:17 AM, Pavel Grunt wrote:
> > ---
> >  src/virt-viewer-display-spice.c | 2 +-
> >  src/virt-viewer-display-vnc.c   | 2 +-
> >  src/virt-viewer-window.c| 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-
> > spice.c
> > index ee07507..a604230 100644
> > --- a/src/virt-viewer-display-spice.c
> > +++ b/src/virt-viewer-display-spice.c
> > @@ -243,7 +243,7 @@ enable_accel_changed(VirtViewerApp *app,
> >   GParamSpec *pspec G_GNUC_UNUSED,
> >   VirtViewerDisplaySpice *self)
> >  {
> > -GtkAccelKey key = { 0 };
> > +GtkAccelKey key = {0, 0, 0};
> >  if (virt_viewer_app_get_enable_accel(app))
> >  gtk_accel_map_lookup_entry("/view/release-cursor",
> > );
> >  
> > diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
> > index 390c366..cb45c23 100644
> > --- a/src/virt-viewer-display-vnc.c
> > +++ b/src/virt-viewer-display-vnc.c
> > @@ -190,7 +190,7 @@ enable_accel_changed(VirtViewerApp *app,
> >   GParamSpec *pspec G_GNUC_UNUSED,
> >   VncDisplay *vnc)
> >  {
> > -GtkAccelKey key = { 0 };
> > +GtkAccelKey key = {0, 0, 0};
> >  if (virt_viewer_app_get_enable_accel(app))
> >  gtk_accel_map_lookup_entry("/view/release-cursor",
> > );
> >  
> > diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> > index 6bf0a2e..c828916 100644
> > --- a/src/virt-viewer-window.c
> > +++ b/src/virt-viewer-window.c
> > @@ -1176,7 +1176,7 @@ virt_viewer_window_update_title(VirtViewerWindow
> > *self)
> >  
> >  if (priv->grabbed) {
> >  gchar *label;
> > -GtkAccelKey key = { 0 };
> > +GtkAccelKey key = {0, 0, 0};
> >  
> >  if (virt_viewer_app_get_enable_accel(priv->app))
> >  
> > gtk_accel_map_lookup_entry("/view/release-cursor", 
> > );
> > 
> 
> 

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers

[Eduardo Lima (Etrunko)]

This is not actually necessary as of C99. You only need to initialize
any field of a structure to get all other fields initialized too.

On 06/22/2016 03:17 AM, Pavel Grunt wrote:
> ---
>  src/virt-viewer-display-spice.c | 2 +-
>  src/virt-viewer-display-vnc.c   | 2 +-
>  src/virt-viewer-window.c| 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c
> index ee07507..a604230 100644
> --- a/src/virt-viewer-display-spice.c
> +++ b/src/virt-viewer-display-spice.c
> @@ -243,7 +243,7 @@ enable_accel_changed(VirtViewerApp *app,
>   GParamSpec *pspec G_GNUC_UNUSED,
>   VirtViewerDisplaySpice *self)
>  {
> -GtkAccelKey key = { 0 };
> +GtkAccelKey key = {0, 0, 0};
>  if (virt_viewer_app_get_enable_accel(app))
>  gtk_accel_map_lookup_entry("/view/release-cursor", 
> );
>  
> diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
> index 390c366..cb45c23 100644
> --- a/src/virt-viewer-display-vnc.c
> +++ b/src/virt-viewer-display-vnc.c
> @@ -190,7 +190,7 @@ enable_accel_changed(VirtViewerApp *app,
>   GParamSpec *pspec G_GNUC_UNUSED,
>   VncDisplay *vnc)
>  {
> -GtkAccelKey key = { 0 };
> +GtkAccelKey key = {0, 0, 0};
>  if (virt_viewer_app_get_enable_accel(app))
>  gtk_accel_map_lookup_entry("/view/release-cursor", 
> );
>  
> diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> index 6bf0a2e..c828916 100644
> --- a/src/virt-viewer-window.c
> +++ b/src/virt-viewer-window.c
> @@ -1176,7 +1176,7 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
>  
>  if (priv->grabbed) {
>  gchar *label;
> -GtkAccelKey key = { 0 };
> +GtkAccelKey key = {0, 0, 0};
>  
>  if (virt_viewer_app_get_enable_accel(priv->app))
>  gtk_accel_map_lookup_entry("/view/release-cursor", 
> );
> 


-- 
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etru...@redhat.com

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

[virt-tools-list] [virt-viewer] mingw,spec: Bump msitools version

[Fabiano Fidêncio]

Fedora 24 has GLib 2.48.0, which brings a new dependency: PCRE.
The new dependency is already added to the wxi file (in msitools) and a
new msitools build including the fix is already done [0].

Let's just bump the version in our spec file and make sure we will be
using the msitools which includes the fix.

[0]: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a7a2db6109
---
 mingw-virt-viewer.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-virt-viewer.spec.in b/mingw-virt-viewer.spec.in
index 3109f5f..06f1992 100644
--- a/mingw-virt-viewer.spec.in
+++ b/mingw-virt-viewer.spec.in
@@ -65,7 +65,7 @@ BuildRequires:  icoutils
 BuildRequires:  dos2unix
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  hwdata
-BuildRequires:  msitools >= 0.95-4
+BuildRequires:  msitools >= 0.95-5
 
 BuildArch:  noarch
 
-- 
2.7.4

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers

[Fabiano Fidêncio]

On Wed, Jun 22, 2016 at 8:17 AM, Pavel Grunt  wrote:
> ---
>  src/virt-viewer-display-spice.c | 2 +-
>  src/virt-viewer-display-vnc.c   | 2 +-
>  src/virt-viewer-window.c| 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c
> index ee07507..a604230 100644
> --- a/src/virt-viewer-display-spice.c
> +++ b/src/virt-viewer-display-spice.c
> @@ -243,7 +243,7 @@ enable_accel_changed(VirtViewerApp *app,
>   GParamSpec *pspec G_GNUC_UNUSED,
>   VirtViewerDisplaySpice *self)
>  {
> -GtkAccelKey key = { 0 };
> +GtkAccelKey key = {0, 0, 0};
>  if (virt_viewer_app_get_enable_accel(app))
>  gtk_accel_map_lookup_entry("/view/release-cursor", 
> );
>
> diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
> index 390c366..cb45c23 100644
> --- a/src/virt-viewer-display-vnc.c
> +++ b/src/virt-viewer-display-vnc.c
> @@ -190,7 +190,7 @@ enable_accel_changed(VirtViewerApp *app,
>   GParamSpec *pspec G_GNUC_UNUSED,
>   VncDisplay *vnc)
>  {
> -GtkAccelKey key = { 0 };
> +GtkAccelKey key = {0, 0, 0};
>  if (virt_viewer_app_get_enable_accel(app))
>  gtk_accel_map_lookup_entry("/view/release-cursor", 
> );
>
> diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> index 6bf0a2e..c828916 100644
> --- a/src/virt-viewer-window.c
> +++ b/src/virt-viewer-window.c
> @@ -1176,7 +1176,7 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
>
>  if (priv->grabbed) {
>  gchar *label;
> -GtkAccelKey key = { 0 };
> +GtkAccelKey key = {0, 0, 0};
>
>  if (virt_viewer_app_get_enable_accel(priv->app))
>  gtk_accel_map_lookup_entry("/view/release-cursor", 
> );
> --
> 2.9.0
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list

Argh, replied only to Pavel.

Acked-by: Fabiano Fidêncio 

-- 
Fabiano Fidêncio

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers

[Pavel Grunt]

On Wed, 2016-06-22 at 10:59 +0200, Fabiano Fidêncio wrote:
> On Wed, Jun 22, 2016 at 8:17 AM, Pavel Grunt  wrote:
> > ---
> >  src/virt-viewer-display-spice.c | 2 +-
> >  src/virt-viewer-display-vnc.c   | 2 +-
> >  src/virt-viewer-window.c| 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-
> > spice.c
> > index ee07507..a604230 100644
> > --- a/src/virt-viewer-display-spice.c
> > +++ b/src/virt-viewer-display-spice.c
> > @@ -243,7 +243,7 @@ enable_accel_changed(VirtViewerApp *app,
> >   GParamSpec *pspec G_GNUC_UNUSED,
> >   VirtViewerDisplaySpice *self)
> >  {
> > -GtkAccelKey key = { 0 };
> > +GtkAccelKey key = {0, 0, 0};
> >  if (virt_viewer_app_get_enable_accel(app))
> >  gtk_accel_map_lookup_entry("/view/release-cursor",
> > );
> > 
> > diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
> > index 390c366..cb45c23 100644
> > --- a/src/virt-viewer-display-vnc.c
> > +++ b/src/virt-viewer-display-vnc.c
> > @@ -190,7 +190,7 @@ enable_accel_changed(VirtViewerApp *app,
> >   GParamSpec *pspec G_GNUC_UNUSED,
> >   VncDisplay *vnc)
> >  {
> > -GtkAccelKey key = { 0 };
> > +GtkAccelKey key = {0, 0, 0};
> >  if (virt_viewer_app_get_enable_accel(app))
> >  gtk_accel_map_lookup_entry("/view/release-cursor",
> > );
> > 
> > diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> > index 6bf0a2e..c828916 100644
> > --- a/src/virt-viewer-window.c
> > +++ b/src/virt-viewer-window.c
> > @@ -1176,7 +1176,7 @@ virt_viewer_window_update_title(VirtViewerWindow
> > *self)
> > 
> >  if (priv->grabbed) {
> >  gchar *label;
> > -GtkAccelKey key = { 0 };
> > +GtkAccelKey key = {0, 0, 0};
> > 
> >  if (virt_viewer_app_get_enable_accel(priv->app))
> >  
> > gtk_accel_map_lookup_entry("/view/release-cursor", 
> > );
> > --
> > 2.9.0
> > 
> > ___
> > virt-tools-list mailing list
> > virt-tools-list@redhat.com
> > https://www.redhat.com/mailman/listinfo/virt-tools-list
> 
> 
> Acked-by: Fabiano Fidêncio 

Thanks, pushed

Pavel

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [PATCH virt-viewer 3/4] window: Use loop instead of multiple ifs

[Fabiano Fidêncio]

On Wed, Jun 22, 2016 at 8:17 AM, Pavel Grunt  wrote:
> Binds modifier's mask and key, also fixes a compile time warning:
>  warning: cast from 'gchar *' (aka 'char *') to 'guint *' (aka 'unsigned
>   int *') increases required alignment from 1 to 4 [-Wcast-align]
>  return (guint*)g_array_free(a, FALSE);
> ---
>  src/virt-viewer-window.c | 39 ++-
>  1 file changed, 18 insertions(+), 21 deletions(-)
>
> diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> index 60a1675..6bf0a2e 100644
> --- a/src/virt-viewer-window.c
> +++ b/src/virt-viewer-window.c
> @@ -608,36 +608,33 @@ virt_viewer_menu_add_combo(VirtViewerWindow *self, 
> GtkMenu *menu,
>  static guint*
>  accel_key_to_keys(const GtkAccelKey *key)
>  {
> -guint val;
> -GArray *a = g_array_new(FALSE, FALSE, sizeof(guint));
> +guint i;
> +guint *val, *keys;
> +const struct {
> +const guint mask;
> +const guint key;
> +} modifiers[] = {
> +{GDK_SHIFT_MASK, GDK_KEY_Shift_L},
> +{GDK_CONTROL_MASK, GDK_KEY_Control_L},
> +{GDK_MOD1_MASK, GDK_KEY_Alt_L},
> +};
>
>  g_warn_if_fail((key->accel_mods &
>  ~(GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) == 
> 0);
>
> +keys = val = g_new(guint, 5); /* up to 3 modifiers, key and the stop 
> symbol */
>  /* first, send the modifiers */
> -if (key->accel_mods & GDK_SHIFT_MASK) {
> -val = GDK_KEY_Shift_L;
> -g_array_append_val(a, val);
> -}
> -
> -if (key->accel_mods & GDK_CONTROL_MASK) {
> -val = GDK_KEY_Control_L;
> -g_array_append_val(a, val);
> -}
> -
> -if (key->accel_mods & GDK_MOD1_MASK) {
> -val = GDK_KEY_Alt_L;
> -g_array_append_val(a, val);
> +for (i = 0; i < G_N_ELEMENTS(modifiers); i++) {
> +if (key->accel_mods & modifiers[i].mask)
> +*val++ = modifiers[i].key;
>  }
>
>  /* only after, the non-modifier key (ctrl-t, not t-ctrl) */
> -val = key->accel_key;
> -g_array_append_val(a, val);
> -
> -val = GDK_KEY_VoidSymbol;
> -g_array_append_val(a, val);
> +*val++ = key->accel_key;
> +/* stop symbol */
> +*val = GDK_KEY_VoidSymbol;
>
> -return (guint*)g_array_free(a, FALSE);
> +return keys;
>  }
>
>  struct accelCbData
> --
> 2.9.0
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list


Acked-by: Fabiano Fidêncio 
-- 
Fabiano Fidêncio

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [PATCH virt-viewer 2/4] window: Move definition from header

[Fabiano Fidêncio]

On Wed, Jun 22, 2016 at 8:17 AM, Pavel Grunt  wrote:
> ---
>  src/virt-viewer-window.c | 2 ++
>  src/virt-viewer-window.h | 1 -
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> index e03df65..60a1675 100644
> --- a/src/virt-viewer-window.c
> +++ b/src/virt-viewer-window.c
> @@ -43,6 +43,8 @@
>  #include "virt-viewer-util.h"
>  #include "view/autoDrawer.h"
>
> +#define ZOOM_STEP 10
> +
>  /* Signal handlers for main window (move in a VirtViewerMainWindow?) */
>  void virt_viewer_window_menu_view_zoom_out(GtkWidget *menu, VirtViewerWindow 
> *self);
>  void virt_viewer_window_menu_view_zoom_in(GtkWidget *menu, VirtViewerWindow 
> *self);
> diff --git a/src/virt-viewer-window.h b/src/virt-viewer-window.h
> index c25e9c9..e9aae4b 100644
> --- a/src/virt-viewer-window.h
> +++ b/src/virt-viewer-window.h
> @@ -33,7 +33,6 @@ G_BEGIN_DECLS
>  #define MIN_ZOOM_LEVEL 10
>  #define MAX_ZOOM_LEVEL 400
>  #define NORMAL_ZOOM_LEVEL 100
> -#define ZOOM_STEP 10
>
>  #define VIRT_VIEWER_TYPE_WINDOW virt_viewer_window_get_type()
>
> --
> 2.9.0
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list


Acked-by: Fabiano Fidêncio 
-- 
Fabiano Fidêncio

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

Re: [virt-tools-list] [PATCH virt-viewer 1/4] window: Do not use constant

[Fabiano Fidêncio]

I'd prefer a commit message as: "window: Use a predefined macro
instead of constant", but that's not a big deal.

On Wed, Jun 22, 2016 at 8:17 AM, Pavel Grunt  wrote:
> ---
>  src/virt-viewer-window.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> index 8ec2521..e03df65 100644
> --- a/src/virt-viewer-window.c
> +++ b/src/virt-viewer-window.c
> @@ -378,7 +378,7 @@ virt_viewer_window_get_real_zoom_level(VirtViewerWindow 
> *self)
>  GtkAllocation allocation;
>  guint width, height;
>
> -g_return_val_if_fail(self->priv->display != NULL, 100);
> +g_return_val_if_fail(self->priv->display != NULL, NORMAL_ZOOM_LEVEL);
>
>  gtk_widget_get_allocation(GTK_WIDGET(self->priv->display), );
>  virt_viewer_display_get_desktop_size(self->priv->display, , 
> );
> --
> 2.9.0
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list


Acked-by: Fabiano Fidêncio 
-- 
Fabiano Fidêncio

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

[virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers

[Pavel Grunt]

---
 src/virt-viewer-display-spice.c | 2 +-
 src/virt-viewer-display-vnc.c   | 2 +-
 src/virt-viewer-window.c| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c
index ee07507..a604230 100644
--- a/src/virt-viewer-display-spice.c
+++ b/src/virt-viewer-display-spice.c
@@ -243,7 +243,7 @@ enable_accel_changed(VirtViewerApp *app,
  GParamSpec *pspec G_GNUC_UNUSED,
  VirtViewerDisplaySpice *self)
 {
-GtkAccelKey key = { 0 };
+GtkAccelKey key = {0, 0, 0};
 if (virt_viewer_app_get_enable_accel(app))
 gtk_accel_map_lookup_entry("/view/release-cursor", );
 
diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
index 390c366..cb45c23 100644
--- a/src/virt-viewer-display-vnc.c
+++ b/src/virt-viewer-display-vnc.c
@@ -190,7 +190,7 @@ enable_accel_changed(VirtViewerApp *app,
  GParamSpec *pspec G_GNUC_UNUSED,
  VncDisplay *vnc)
 {
-GtkAccelKey key = { 0 };
+GtkAccelKey key = {0, 0, 0};
 if (virt_viewer_app_get_enable_accel(app))
 gtk_accel_map_lookup_entry("/view/release-cursor", );
 
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index 6bf0a2e..c828916 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -1176,7 +1176,7 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
 
 if (priv->grabbed) {
 gchar *label;
-GtkAccelKey key = { 0 };
+GtkAccelKey key = {0, 0, 0};
 
 if (virt_viewer_app_get_enable_accel(priv->app))
 gtk_accel_map_lookup_entry("/view/release-cursor", 
);
-- 
2.9.0

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

[virt-tools-list] [PATCH virt-viewer 3/4] window: Use loop instead of multiple ifs

[Pavel Grunt]

Binds modifier's mask and key, also fixes a compile time warning:
 warning: cast from 'gchar *' (aka 'char *') to 'guint *' (aka 'unsigned
  int *') increases required alignment from 1 to 4 [-Wcast-align]
 return (guint*)g_array_free(a, FALSE);
---
 src/virt-viewer-window.c | 39 ++-
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index 60a1675..6bf0a2e 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -608,36 +608,33 @@ virt_viewer_menu_add_combo(VirtViewerWindow *self, 
GtkMenu *menu,
 static guint*
 accel_key_to_keys(const GtkAccelKey *key)
 {
-guint val;
-GArray *a = g_array_new(FALSE, FALSE, sizeof(guint));
+guint i;
+guint *val, *keys;
+const struct {
+const guint mask;
+const guint key;
+} modifiers[] = {
+{GDK_SHIFT_MASK, GDK_KEY_Shift_L},
+{GDK_CONTROL_MASK, GDK_KEY_Control_L},
+{GDK_MOD1_MASK, GDK_KEY_Alt_L},
+};
 
 g_warn_if_fail((key->accel_mods &
 ~(GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) == 
0);
 
+keys = val = g_new(guint, 5); /* up to 3 modifiers, key and the stop 
symbol */
 /* first, send the modifiers */
-if (key->accel_mods & GDK_SHIFT_MASK) {
-val = GDK_KEY_Shift_L;
-g_array_append_val(a, val);
-}
-
-if (key->accel_mods & GDK_CONTROL_MASK) {
-val = GDK_KEY_Control_L;
-g_array_append_val(a, val);
-}
-
-if (key->accel_mods & GDK_MOD1_MASK) {
-val = GDK_KEY_Alt_L;
-g_array_append_val(a, val);
+for (i = 0; i < G_N_ELEMENTS(modifiers); i++) {
+if (key->accel_mods & modifiers[i].mask)
+*val++ = modifiers[i].key;
 }
 
 /* only after, the non-modifier key (ctrl-t, not t-ctrl) */
-val = key->accel_key;
-g_array_append_val(a, val);
-
-val = GDK_KEY_VoidSymbol;
-g_array_append_val(a, val);
+*val++ = key->accel_key;
+/* stop symbol */
+*val = GDK_KEY_VoidSymbol;
 
-return (guint*)g_array_free(a, FALSE);
+return keys;
 }
 
 struct accelCbData
-- 
2.9.0

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

[virt-tools-list] [PATCH virt-viewer 2/4] window: Move definition from header

[Pavel Grunt]

---
 src/virt-viewer-window.c | 2 ++
 src/virt-viewer-window.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index e03df65..60a1675 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -43,6 +43,8 @@
 #include "virt-viewer-util.h"
 #include "view/autoDrawer.h"
 
+#define ZOOM_STEP 10
+
 /* Signal handlers for main window (move in a VirtViewerMainWindow?) */
 void virt_viewer_window_menu_view_zoom_out(GtkWidget *menu, VirtViewerWindow 
*self);
 void virt_viewer_window_menu_view_zoom_in(GtkWidget *menu, VirtViewerWindow 
*self);
diff --git a/src/virt-viewer-window.h b/src/virt-viewer-window.h
index c25e9c9..e9aae4b 100644
--- a/src/virt-viewer-window.h
+++ b/src/virt-viewer-window.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
 #define MIN_ZOOM_LEVEL 10
 #define MAX_ZOOM_LEVEL 400
 #define NORMAL_ZOOM_LEVEL 100
-#define ZOOM_STEP 10
 
 #define VIRT_VIEWER_TYPE_WINDOW virt_viewer_window_get_type()
 
-- 
2.9.0

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

[virt-tools-list] [PATCH virt-viewer 1/4] window: Do not use constant

[Pavel Grunt]

---
 src/virt-viewer-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index 8ec2521..e03df65 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -378,7 +378,7 @@ virt_viewer_window_get_real_zoom_level(VirtViewerWindow 
*self)
 GtkAllocation allocation;
 guint width, height;
 
-g_return_val_if_fail(self->priv->display != NULL, 100);
+g_return_val_if_fail(self->priv->display != NULL, NORMAL_ZOOM_LEVEL);
 
 gtk_widget_get_allocation(GTK_WIDGET(self->priv->display), );
 virt_viewer_display_get_desktop_size(self->priv->display, , );
-- 
2.9.0

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list