[gnote] Replace GDK_WINDOW_XWINDOW with GDK_WINDOW_XID

[Aurimas Černius <aurimasc src gnome org>]

commit f3d6c6be649acdf9e752b188f04afe4e5c439388
Author: Aurimas Ä?ernius <aurisc4 gmail com>
Date:   Thu Apr 14 22:20:26 2011 +0300

    Replace GDK_WINDOW_XWINDOW with GDK_WINDOW_XID
    
    GDK_WINDOW_XWINDOW is not available in GTK 3.

 libtomboy/tomboykeybinder.c |    6 +++---
 libtomboy/tomboyutil.c      |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libtomboy/tomboykeybinder.c b/libtomboy/tomboykeybinder.c
index 77d32c2..c920617 100644
--- a/libtomboy/tomboykeybinder.c
+++ b/libtomboy/tomboykeybinder.c
@@ -1,6 +1,6 @@
 /* tomboykeybinder.c
  *
- * Copyright (C) 2010 Aurimas Cernius
+ * Copyright (C) 2010-2011 Aurimas Cernius
  * Copyright (C) 2008 Alex Graveley
  *
  * Permission is hereby granted, free of charge, to any person obtaining 
@@ -92,7 +92,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
 			XGrabKey (GDK_WINDOW_XDISPLAY (rootwin), 
 				  binding->keycode, 
 				  binding->modifiers | mod_masks [i], 
-				  GDK_WINDOW_XWINDOW (rootwin), 
+				  GDK_WINDOW_XID (rootwin),
 				  False, 
 				  GrabModeAsync,
 				  GrabModeAsync);
@@ -100,7 +100,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
 			XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin),
 				    binding->keycode,
 				    binding->modifiers | mod_masks [i], 
-				    GDK_WINDOW_XWINDOW (rootwin));
+				    GDK_WINDOW_XID (rootwin));
 		}
 	}
 }
diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c
index 9de7e62..4cbe5e6 100644
--- a/libtomboy/tomboyutil.c
+++ b/libtomboy/tomboyutil.c
@@ -1,4 +1,5 @@
 /* tomboyutil.c
+ * Copyright (C) 2011 Aurimas Cernius
  * Copyright (C) 2008 Alex Graveley
  *
  * Permission is hereby granted, free of charge, to any person obtaining 
@@ -103,7 +104,7 @@ tomboy_window_move_to_current_workspace (GtkWindow *window)
 	xev.xclient.serial = 0;
 	xev.xclient.send_event = True;
 	xev.xclient.display = GDK_WINDOW_XDISPLAY (gdkwin);
-	xev.xclient.window = GDK_WINDOW_XWINDOW (gdkwin);
+	xev.xclient.window = GDK_WINDOW_XID (gdkwin);
 	xev.xclient.message_type = 
 		gdk_x11_atom_to_xatom_for_display(
 			gdk_drawable_get_display (gdkwin),
@@ -114,7 +115,7 @@ tomboy_window_move_to_current_workspace (GtkWindow *window)
 	xev.xclient.data.l[2] = 0;
 
 	XSendEvent (GDK_WINDOW_XDISPLAY (rootwin),
-		    GDK_WINDOW_XWINDOW (rootwin),
+		    GDK_WINDOW_XID (rootwin),
 		    False,
 		    SubstructureRedirectMask | SubstructureNotifyMask,
 		    &xev);