[rhythmbox/gobject-introspection: 22/41] deal with latest gtk api changes

[Jonathan Matthew <jmatthew src gnome org>]

commit ca84d5b1ac9e6629d0bc6bfee3258b833ccd7704
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Dec 3 10:16:28 2010 +1000

    deal with latest gtk api changes

 lib/rb-missing-plugins.c                           |    2 +-
 .../rb-disc-recorder-plugin.c                      |    2 +-
 plugins/power-manager/rb-power-manager-plugin.c    |    2 +-
 plugins/status-icon/rb-status-icon-plugin.c        |    2 +-
 plugins/visualizer/rb-vis-widget.c                 |    4 ++--
 plugins/visualizer/rb-visualizer-plugin.c          |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/lib/rb-missing-plugins.c b/lib/rb-missing-plugins.c
index c273d1b..b67f5d8 100644
--- a/lib/rb-missing-plugins.c
+++ b/lib/rb-missing-plugins.c
@@ -216,7 +216,7 @@ rb_missing_plugins_install (const char **details, gboolean ignore_blacklist, GCl
 	if (parent_window != NULL && gtk_widget_get_realized (GTK_WIDGET (parent_window))) {
 #ifdef GDK_WINDOWING_X11
 		gulong xid = 0;
-		xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (GTK_WIDGET (parent_window)));
+		xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (parent_window)));
 		gst_install_plugins_context_set_xid (install_ctx, xid);
 #endif
 	}
diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
index ae4e69a..33bc853 100644
--- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
+++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
@@ -178,7 +178,7 @@ rb_disc_recorder_plugin_start_burning (RBDiscRecorderPlugin *pi,
 	window = gtk_widget_get_window (main_window);
 	if (window) {
 		int xid;
-		xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (window));
+		xid = gdk_x11_window_get_xid (window);
 		xid_str = g_strdup_printf ("%d", xid);
 		g_ptr_array_add (array, "-x");
 		g_ptr_array_add (array, xid_str);
diff --git a/plugins/power-manager/rb-power-manager-plugin.c b/plugins/power-manager/rb-power-manager-plugin.c
index 2b5f817..c25f3d3 100644
--- a/plugins/power-manager/rb-power-manager-plugin.c
+++ b/plugins/power-manager/rb-power-manager-plugin.c
@@ -187,7 +187,7 @@ inhibit (RBGPMPlugin *plugin)
 	rb_debug ("inhibiting");
 	g_object_ref (plugin);
 	g_object_get (plugin->shell, "window", &window, NULL);
-	xid = GDK_WINDOW_XWINDOW (gtk_widget_get_window (GTK_WIDGET (window)));
+	xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (window)));
 	dbus_g_proxy_begin_call (plugin->proxy, "Inhibit",
 				 (DBusGProxyCallNotify) inhibit_cb,
 				 plugin,
diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
index 7af6fbe..66d0992 100644
--- a/plugins/status-icon/rb-status-icon-plugin.c
+++ b/plugins/status-icon/rb-status-icon-plugin.c
@@ -1054,7 +1054,7 @@ set_icon_geometry  (GdkWindow *window,
 		    int        height)
 {
 	gulong data[4];
-	Display *dpy = gdk_x11_drawable_get_xdisplay (window);
+	Display *dpy = GDK_WINDOW_XDISPLAY (window);
 
 	data[0] = x;
 	data[1] = y;
diff --git a/plugins/visualizer/rb-vis-widget.c b/plugins/visualizer/rb-vis-widget.c
index 5018ea6..3f7056d 100644
--- a/plugins/visualizer/rb-vis-widget.c
+++ b/plugins/visualizer/rb-vis-widget.c
@@ -131,8 +131,8 @@ rb_vis_widget_draw (GtkWidget *widget, cairo_t *cr)
 
 	window = gtk_widget_get_window (widget);
 
-	if (rbvw->window_xid != GDK_WINDOW_XWINDOW (window)) {
-		rbvw->window_xid = GDK_WINDOW_XWINDOW (window);
+	if (rbvw->window_xid != GDK_WINDOW_XID (window)) {
+		rbvw->window_xid = GDK_WINDOW_XID (window);
 
 		gdk_display_sync (gdk_window_get_display (window));
 
diff --git a/plugins/visualizer/rb-visualizer-plugin.c b/plugins/visualizer/rb-visualizer-plugin.c
index 16dab05..6f9f2a7 100644
--- a/plugins/visualizer/rb-visualizer-plugin.c
+++ b/plugins/visualizer/rb-visualizer-plugin.c
@@ -1116,7 +1116,7 @@ update_window (RBVisualizerPlugin *plugin, VisualizerMode mode, int screen, int
 	} else {
 		if (plugin->xoverlay != NULL) {
 			gst_x_overlay_set_xwindow_id (plugin->xoverlay,
-						      GDK_WINDOW_XWINDOW (plugin->fake_window));
+						      GDK_WINDOW_XID (plugin->fake_window));
 		}
 
 		switch (plugin->mode) {
@@ -1246,7 +1246,7 @@ update_window (RBVisualizerPlugin *plugin, VisualizerMode mode, int screen, int
 		if (plugin->remote_window == 0) {
 			gdk_screen = get_screen (plugin, screen);
 			root_window = gdk_screen_get_root_window (gdk_screen);
-			plugin->remote_window = GDK_WINDOW_XWINDOW (root_window);
+			plugin->remote_window = GDK_WINDOW_XID (root_window);
 			rb_debug ("got root window id %lu", plugin->remote_window);
 		}