diff mbox

[v2] gtk: don't use g_object_unref on GdkCursor

Message ID 1370294084-4576-1-git-send-email-aliguori@us.ibm.com
State New
Headers show

Commit Message

Anthony Liguori June 3, 2013, 9:14 p.m. UTC
It's not a GObject.

Cc: Gerd Hoffman <kraxel@redhat.com>
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
v1 -> v2
 - Fix summary to agree with code (Peter)
---
 ui/gtk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gerd Hoffmann June 4, 2013, 7:51 a.m. UTC | #1
On 06/03/13 23:14, Anthony Liguori wrote:
> -    g_object_unref(cursor);
> +    gdk_cursor_unref(cursor);

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
  Gerd
Andreas Färber June 4, 2013, 12:08 p.m. UTC | #2
Am 03.06.2013 23:14, schrieb Anthony Liguori:
> It's not a GObject.
> 
> Cc: Gerd Hoffman <kraxel@redhat.com>
> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> ---
> v1 -> v2
>  - Fix summary to agree with code (Peter)
> ---
>  ui/gtk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Seems this was accidentally cherry-picked rather than git-am'ed. ;)

Andreas
Anthony Liguori June 4, 2013, 3:35 p.m. UTC | #3
Andreas Färber <afaerber@suse.de> writes:

> Am 03.06.2013 23:14, schrieb Anthony Liguori:
>> It's not a GObject.
>> 
>> Cc: Gerd Hoffman <kraxel@redhat.com>
>> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
>> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>> ---
>> v1 -> v2
>>  - Fix summary to agree with code (Peter)
>> ---
>>  ui/gtk.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Seems this was accidentally cherry-picked rather than git-am'ed. ;)

Sort of, but yes.

Regards,

Anthony Liguori

>
> Andreas
>
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Anthony Liguori June 10, 2013, 9:48 p.m. UTC | #4
Applied.  Thanks.

Regards,

Anthony Liguori
Bruce Rogers July 22, 2013, 8:36 p.m. UTC | #5
>>> On 6/3/2013 at 03:14 PM, Anthony Liguori <aliguori@us.ibm.com> wrote: 
> It's not a GObject.
> 
> Cc: Gerd Hoffman <kraxel@redhat.com>
> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> ---
> v1 -> v2
>  - Fix summary to agree with code (Peter)
> ---
>  ui/gtk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 8dc9041..3bc2842 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -377,7 +377,7 @@ static void gd_cursor_define(DisplayChangeListener *dcl,
>                                          pixbuf, c->hot_x, c->hot_y);
>      gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor);
>      g_object_unref(pixbuf);
> -    g_object_unref(cursor);
> +    gdk_cursor_unref(cursor);
>  }
>  
>  static void gd_switch(DisplayChangeListener *dcl,


This is a candidate for the 1.5.2 stable release.

Bruce
Bruce Rogers July 22, 2013, 8:37 p.m. UTC | #6
>>> On 6/3/2013 at 03:14 PM, Anthony Liguori <aliguori@us.ibm.com> wrote: 
> It's not a GObject.
> 
> Cc: Gerd Hoffman <kraxel@redhat.com>
> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> ---
> v1 -> v2
>  - Fix summary to agree with code (Peter)
> ---
>  ui/gtk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 8dc9041..3bc2842 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -377,7 +377,7 @@ static void gd_cursor_define(DisplayChangeListener *dcl,
>                                          pixbuf, c->hot_x, c->hot_y);
>      gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor);
>      g_object_unref(pixbuf);
> -    g_object_unref(cursor);
> +    gdk_cursor_unref(cursor);
>  }
>  
>  static void gd_switch(DisplayChangeListener *dcl,


This is a candidate for the 1.5.2 stable release.

Bruce
diff mbox

Patch

diff --git a/ui/gtk.c b/ui/gtk.c
index 8dc9041..3bc2842 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -377,7 +377,7 @@  static void gd_cursor_define(DisplayChangeListener *dcl,
                                         pixbuf, c->hot_x, c->hot_y);
     gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor);
     g_object_unref(pixbuf);
-    g_object_unref(cursor);
+    gdk_cursor_unref(cursor);
 }
 
 static void gd_switch(DisplayChangeListener *dcl,