Patchwork ui/gtk: Use gtk_widget_get_window() to support both gtk2 and gtk3

login
register
mail settings
Submitter Ozan Çağlayan
Date April 23, 2013, 10:03 a.m.
Message ID <1366711402-1750-1-git-send-email-ozancag@gmail.com>
Download mbox | patch
Permalink /patch/238850/
State New
Headers show

Comments

Ozan Çağlayan - April 23, 2013, 10:03 a.m.
This fixes build with gtk+-3.0.

Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
---
 ui/gtk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Anthony Liguori - April 24, 2013, 6:24 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/ui/gtk.c b/ui/gtk.c
index b46997a..4110342 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -337,7 +337,7 @@  static void gd_mouse_set(DisplayChangeListener *dcl,
     GtkDisplayState *s = container_of(dcl, GtkDisplayState, dcl);
     gint x_root, y_root;
 
-    gdk_window_get_root_coords(s->drawing_area->window,
+    gdk_window_get_root_coords(gtk_widget_get_window(s->drawing_area),
                                x, y, &x_root, &y_root);
     gdk_display_warp_pointer(gtk_widget_get_display(s->drawing_area),
                              gtk_widget_get_screen(s->drawing_area),
@@ -357,7 +357,7 @@  static void gd_cursor_define(DisplayChangeListener *dcl,
                                       NULL, NULL);
     cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(s->drawing_area),
                                         pixbuf, c->hot_x, c->hot_y);
-    gdk_window_set_cursor(s->drawing_area->window, cursor);
+    gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor);
     g_object_unref(pixbuf);
     g_object_unref(cursor);
 }