<br><br>On Tuesday, April 5, 2016, Eduardo Lima (Etrunko) <<a href="mailto:etrunko@redhat.com">etrunko@redhat.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Acked-by: Eduardo Lima (Etrunko) <<a href="javascript:;" onclick="_e(event, 'cvml', 'etrunko@redhat.com')">etrunko@redhat.com</a>><br>
<br>
Maybe could be squashed with next one.<br>
<br></blockquote><div>OK, I will do it</div><div><br></div><div>Thanks,</div><div>Pavel </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
On 04/05/2016 01:58 PM, Pavel Grunt wrote:<br>
> ---<br>
>  src/spice-channel.c    | 11 ++---------<br>
>  src/spice-widget.c     | 22 ++++------------------<br>
>  src/wocky-http-proxy.c |  3 +--<br>
>  3 files changed, 7 insertions(+), 29 deletions(-)<br>
><br>
> diff --git a/src/spice-channel.c b/src/spice-channel.c<br>
> index 8ae0e4d..e9c5a1b 100644<br>
> --- a/src/spice-channel.c<br>
> +++ b/src/spice-channel.c<br>
> @@ -155,10 +155,7 @@ static void spice_channel_dispose(GObject *gobject)<br>
><br>
>      spice_channel_disconnect(channel, SPICE_CHANNEL_CLOSED);<br>
><br>
> -    if (c->session) {<br>
> -         g_object_unref(c->session);<br>
> -         c->session = NULL;<br>
> -    }<br>
> +    g_clear_object(&c->session);<br>
><br>
>      g_clear_error(&c->error);<br>
><br>
> @@ -2718,11 +2715,7 @@ static void channel_reset(SpiceChannel *channel, gboolean migrating)<br>
>          c->ctx = NULL;<br>
>      }<br>
><br>
> -    if (c->conn) {<br>
> -        g_object_unref(c->conn);<br>
> -        c->conn = NULL;<br>
> -    }<br>
> -<br>
> +    g_clear_object(&c->conn);<br>
>      g_clear_object(&c->sock);<br>
><br>
>      c->fd = -1;<br>
> diff --git a/src/spice-widget.c b/src/spice-widget.c<br>
> index 8ca8631..72a0355 100644<br>
> --- a/src/spice-widget.c<br>
> +++ b/src/spice-widget.c<br>
> @@ -439,20 +439,9 @@ static void spice_display_finalize(GObject *obj)<br>
>      g_free(d->activeseq);<br>
>      d->activeseq = NULL;<br>
><br>
> -    if (d->show_cursor) {<br>
> -        g_object_unref(d->show_cursor);<br>
> -        d->show_cursor = NULL;<br>
> -    }<br>
> -<br>
> -    if (d->mouse_cursor) {<br>
> -        g_object_unref(d->mouse_cursor);<br>
> -        d->mouse_cursor = NULL;<br>
> -    }<br>
> -<br>
> -    if (d->mouse_pixbuf) {<br>
> -        g_object_unref(d->mouse_pixbuf);<br>
> -        d->mouse_pixbuf = NULL;<br>
> -    }<br>
> +    g_clear_object(&d->show_cursor);<br>
> +    g_clear_object(&d->mouse_cursor);<br>
> +    g_clear_object(&d->mouse_pixbuf);<br>
><br>
>      G_OBJECT_CLASS(spice_display_parent_class)->finalize(obj);<br>
>  }<br>
> @@ -2343,10 +2332,7 @@ static void cursor_set(SpiceCursorChannel *channel,<br>
><br>
>      cursor_invalidate(display);<br>
><br>
> -    if (d->mouse_pixbuf) {<br>
> -        g_object_unref(d->mouse_pixbuf);<br>
> -        d->mouse_pixbuf = NULL;<br>
> -    }<br>
> +    g_clear_object(&d->mouse_pixbuf);<br>
><br>
>      if (rgba != NULL) {<br>
>          d->mouse_pixbuf = gdk_pixbuf_new_from_data(g_memdup(rgba, width * height * 4),<br>
> diff --git a/src/wocky-http-proxy.c b/src/wocky-http-proxy.c<br>
> index a1a030a..33d57d8 100644<br>
> --- a/src/wocky-http-proxy.c<br>
> +++ b/src/wocky-http-proxy.c<br>
> @@ -222,8 +222,7 @@ wocky_http_proxy_connect (GProxy *proxy,<br>
>    g_free (buffer);<br>
>    buffer = g_data_input_stream_read_until (data_in, HTTP_END_MARKER, NULL,<br>
>        cancellable, error);<br>
> -  g_object_unref (data_in);<br>
> -  data_in = NULL;<br>
> +  g_clear_object(&data_in);<br>
><br>
>    if (buffer == NULL)<br>
>      {<br>
><br>
<br>
<br>
--<br>
Eduardo de Barros Lima (Etrunko)<br>
Software Engineer - RedHat<br>
<a href="javascript:;" onclick="_e(event, 'cvml', 'etrunko@redhat.com')">etrunko@redhat.com</a><br>
</blockquote>