[Spice-devel] [spice-gtk v3 14/19] log: use plain spice_debug instead of VNC_DEBUG

[Victor Toso]

---
 src/vncdisplaykeymap.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index e113981..7809ae4 100644
--- a/src/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
@@ -17,10 +17,6 @@
 
 #include "spice-util.h"
 
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "vnc-keymap"
-#define VNC_DEBUG(message) spice_debug(message);
-
 /*
  * This table is taken from QEMU x_keymap.c, under the terms:
  *
@@ -189,19 +185,19 @@ const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
 		}
 
 		if (check_for_xwin(dpy)) {
-			VNC_DEBUG("Using xwin keycode mapping");
+			spice_debug("Using xwin keycode mapping");
 			*maplen = G_N_ELEMENTS(keymap_xorgxwin2xtkbd);
 			return keymap_xorgxwin2xtkbd;
 		} else if (check_for_xquartz(dpy)) {
-			VNC_DEBUG("Using xquartz keycode mapping");
+			spice_debug("Using xquartz keycode mapping");
 			*maplen = G_N_ELEMENTS(keymap_xorgxquartz2xtkbd);
 			return keymap_xorgxquartz2xtkbd;
 		} else if (keycodes && STRPREFIX(keycodes, "evdev")) {
-			VNC_DEBUG("Using evdev keycode mapping");
+			spice_debug("Using evdev keycode mapping");
 			*maplen = G_N_ELEMENTS(keymap_xorgevdev2xtkbd);
 			return keymap_xorgevdev2xtkbd;
 		} else if (keycodes && STRPREFIX(keycodes, "xfree86")) {
-			VNC_DEBUG("Using xfree86 keycode mapping");
+			spice_debug("Using xfree86 keycode mapping");
 			*maplen = G_N_ELEMENTS(keymap_xorgkbd2xtkbd);
 			return keymap_xorgkbd2xtkbd;
 		} else {
@@ -222,7 +218,7 @@ const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
 
 #ifdef GDK_WINDOWING_WIN32
 	if (GDK_IS_WIN32_WINDOW(window)) {
-		VNC_DEBUG("Using Win32 virtual keycode mapping");
+		spice_debug("Using Win32 virtual keycode mapping");
 		*maplen = G_N_ELEMENTS(keymap_win322xtkbd);
 		return keymap_win322xtkbd;
 	}
@@ -230,7 +226,7 @@ const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
 
 #ifdef GDK_WINDOWING_QUARTZ
 	if (GDK_IS_QUARTZ_WINDOW(window)) {
-		VNC_DEBUG("Using OS-X virtual keycode mapping");
+		spice_debug("Using OS-X virtual keycode mapping");
 		*maplen = G_N_ELEMENTS(keymap_osx2xtkbd);
 		return keymap_osx2xtkbd;
 	}
@@ -238,7 +234,7 @@ const guint16 *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window,
 
 #ifdef GDK_WINDOWING_WAYLAND
 	if (GDK_IS_WAYLAND_WINDOW(window)) {
-		VNC_DEBUG("Using Wayland Xorg/evdev virtual keycode mapping");
+		spice_debug("Using Wayland Xorg/evdev virtual keycode mapping");
 		*maplen = G_N_ELEMENTS(keymap_xorgevdev2xtkbd);
 		return keymap_xorgevdev2xtkbd;
         }
-- 
2.5.0