[Spice-devel] [PATCH spice-gtk 5/7] vncdisplaykeymap: adapt gtk2 compat code

Marc-André Lureau marcandre.lureau at gmail.com
Fri May 10 13:46:06 PDT 2013


---
 gtk/vncdisplaykeymap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gtk/vncdisplaykeymap.c b/gtk/vncdisplaykeymap.c
index 1f17165..b5241c1 100644
--- a/gtk/vncdisplaykeymap.c
+++ b/gtk/vncdisplaykeymap.c
@@ -75,8 +75,8 @@ static unsigned int ref_count_for_untranslated_keys = 0;
 #include "vncdisplaykeymap_xorgxwin2xtkbd.c"
 
 /* Gtk2 compat */
-#ifndef GDK_IS_X11_DISPLAY
-#define GDK_IS_X11_DISPLAY(dpy) (dpy == dpy)
+#ifndef GDK_IS_X11_WINDOW
+#define GDK_IS_X11_WINDOW(win) (win == win)
 #endif
 #endif
 
@@ -85,8 +85,8 @@ static unsigned int ref_count_for_untranslated_keys = 0;
 #include "vncdisplaykeymap_win322xtkbd.c"
 
 /* Gtk2 compat */
-#ifndef GDK_IS_WIN32_DISPLAY
-#define GDK_IS_WIN32_DISPLAY(dpy) (dpy == dpy)
+#ifndef GDK_IS_WIN32_WINDOW
+#define GDK_IS_WIN32_WINDOW(win) (win == win)
 #endif
 #endif
 
@@ -95,8 +95,8 @@ static unsigned int ref_count_for_untranslated_keys = 0;
 #include "vncdisplaykeymap_osx2xtkbd.c"
 
 /* Gtk2 compat */
-#ifndef GDK_IS_QUARTZ_DISPLAY
-#define GDK_IS_QUARTZ_DISPLAY(dpy) (dpy == dpy)
+#ifndef GDK_IS_QUARTZ_WINDOW
+#define GDK_IS_QUARTZ_WINDOW(win) (win == win)
 #endif
 #endif
 
-- 
1.8.2.1.342.gfa7285d



More information about the Spice-devel mailing list