File 0040-gtk-Fix-compiler-warning-GTK-3-depr.patch of Package qemu

Overview Repositories Revisions Requests Users Attributes Meta

File 0040-gtk-Fix-compiler-warning-GTK-3-depr.patch of Package qemu (Revision 8f0b262e431241b182ed22a873460b44)

Currently displaying revision 8f0b262e431241b182ed22a873460b44 , Show latest

From d054b88496c4699ecaf821072ddd6be0edc46815 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Sun, 16 Jun 2013 16:13:07 +0200
Subject: [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
Message-id: 1371391987-10795-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 030b4b7debf659dcd6fc66826564285fdce5057d)
[bnc#830459]

Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 ui/gtk.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 79fa1d5..d8baea8 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,

Places

File 0040-gtk-Fix-compiler-warning-GTK-3-depr.patch of Package qemu (Revision 8f0b262e431241b182ed22a873460b44)

Places