| Message ID | 1371391987-10795-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Accepted |
| Headers | show |
Applied. Thanks. Regards, Anthony Liguori
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
>>> 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
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,
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(+)