* [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function)
@ 2013-06-16 14:13 Stefan Weil
2013-06-17 21:06 ` Anthony Liguori
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stefan Weil @ 2013-06-16 14:13 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Stefan Weil, qemu-devel
With GTK 3, the function gdk_cursor_unref is deprecated:
qemu/ui/gtk.c: In function ‘gd_cursor_define’:
qemu/ui/gtk.c:380:5: error:
‘gdk_cursor_unref’ is deprecated (declared at /usr/include/gtk-3.0/gdk/gdkcursor.h:233): Use 'g_object_unref' instead [-Werror=deprecated-declarations]
Fix the gcc compiler warning by using conditional compilation.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
ui/gtk.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ui/gtk.c b/ui/gtk.c
index 50a6993..7310e20 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -377,7 +377,11 @@ 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);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gdk_cursor_unref(cursor);
+#else
+ g_object_unref(cursor);
+#endif
}
static void gd_switch(DisplayChangeListener *dcl,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function)
2013-06-16 14:13 [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function) Stefan Weil
@ 2013-06-17 21:06 ` Anthony Liguori
2013-06-18 2:29 ` Michael Tokarev
2013-07-22 20:53 ` Bruce Rogers
2 siblings, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2013-06-17 21:06 UTC (permalink / raw)
To: Stefan Weil, Anthony Liguori; +Cc: qemu-devel
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function)
2013-06-16 14:13 [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function) Stefan Weil
2013-06-17 21:06 ` Anthony Liguori
@ 2013-06-18 2:29 ` Michael Tokarev
2013-07-22 20:53 ` Bruce Rogers
2 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2013-06-18 2:29 UTC (permalink / raw)
To: Stefan Weil; +Cc: Anthony Liguori, qemu-devel
16.06.2013 18:13, Stefan Weil wrote:
> With GTK 3, the function gdk_cursor_unref is deprecated:
>
> qemu/ui/gtk.c: In function ‘gd_cursor_define’:
> qemu/ui/gtk.c:380:5: error:
> ‘gdk_cursor_unref’ is deprecated (declared at /usr/include/gtk-3.0/gdk/gdkcursor.h:233): Use 'g_object_unref' instead [-Werror=deprecated-declarations]
>
> Fix the gcc compiler warning by using conditional compilation.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> ui/gtk.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 50a6993..7310e20 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -377,7 +377,11 @@ 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);
> +#if !GTK_CHECK_VERSION(3, 0, 0)
> gdk_cursor_unref(cursor);
> +#else
> + g_object_unref(cursor);
> +#endif
> }
It's fun that this very change - to use cursor_unref instead of object_unref -
that caused this warning to appear was a fix for a bug, see 171392406d8e2.
Oh well.
/mjt
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function)
2013-06-16 14:13 [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function) Stefan Weil
2013-06-17 21:06 ` Anthony Liguori
2013-06-18 2:29 ` Michael Tokarev
@ 2013-07-22 20:53 ` Bruce Rogers
2 siblings, 0 replies; 4+ messages in thread
From: Bruce Rogers @ 2013-07-22 20:53 UTC (permalink / raw)
To: Anthony Liguori, Stefan Weil; +Cc: qemu-devel, qemu-stable
>>> On 6/16/2013 at 08:13 AM, Stefan Weil <sw@weilnetz.de> wrote:
> With GTK 3, the function gdk_cursor_unref is deprecated:
>
> qemu/ui/gtk.c: In function *gd_cursor_define*:
> qemu/ui/gtk.c:380:5: error:
> *gdk_cursor_unref* is deprecated (declared at
> /usr/include/gtk-3.0/gdk/gdkcursor.h:233): Use 'g_object_unref' instead
> [-Werror=deprecated-declarations]
>
> Fix the gcc compiler warning by using conditional compilation.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> ui/gtk.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 50a6993..7310e20 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -377,7 +377,11 @@ 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);
> +#if !GTK_CHECK_VERSION(3, 0, 0)
> gdk_cursor_unref(cursor);
> +#else
> + g_object_unref(cursor);
> +#endif
> }
>
> static void gd_switch(DisplayChangeListener *dcl,
> --
> 1.7.10.4
This is a candidate for the 1.5.2 stable release.
Bruce
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-07-22 20:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-16 14:13 [Qemu-devel] [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function) Stefan Weil
2013-06-17 21:06 ` Anthony Liguori
2013-06-18 2:29 ` Michael Tokarev
2013-07-22 20:53 ` Bruce Rogers
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.