[Spice-devel] [spice-gtk v2] spicy: keep status of mouse/agent on server mode

[Christophe Fergeau]

missing log..

Christophe

On Thu, Mar 02, 2017 at 10:45:15AM +0100, Victor Toso wrote:
> From: Victor Toso <me at victortoso.com>
> 
> Signed-off-by: Victor Toso <victortoso at redhat.com>
> ---
>  tools/spicy.c | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/spicy.c b/tools/spicy.c
> index ce6b40b..112312c 100644
> --- a/tools/spicy.c
> +++ b/tools/spicy.c
> @@ -182,23 +182,25 @@ static int ask_user(GtkWidget *parent, char *title, char *message,
>  
>  static void update_status_window(SpiceWindow *win)
>  {
> -    gchar *status;
> +    GString *status;
>  
>      if (win == NULL)
>          return;
>  
> +    status = g_string_new(NULL);
> +    g_string_printf(status, "mouse: %6s, agent: %3s",
> +                    win->conn->mouse_state,
> +                    win->conn->agent_state);
> +
>      if (win->mouse_grabbed) {
>          SpiceGrabSequence *sequence = spice_display_get_grab_keys(SPICE_DISPLAY(win->spice));
>          gchar *seq = spice_grab_sequence_as_string(sequence);
> -        status = g_strdup_printf("Use %s to ungrab mouse.", seq);
> +        g_string_append_printf(status, "\tUse %s to ungrab mouse", seq);
>          g_free(seq);
> -    } else {
> -        status = g_strdup_printf("mouse: %s, agent: %s",
> -                 win->conn->mouse_state, win->conn->agent_state);
>      }
>  
> -    gtk_label_set_text(GTK_LABEL(win->status), status);
> -    g_free(status);
> +    gtk_label_set_text(GTK_LABEL(win->status), status->str);
> +    g_string_free(status, TRUE);
>  }
>  
>  static void update_status(struct spice_connection *conn)
> -- 
> 2.9.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170302/81474dd0/attachment.sig>