[nautilus] Fix the build with latest GTK+



commit d9331ae959593cd81f59b39d61597278162ac7eb
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 2 18:51:03 2010 -0500

    Fix the build with latest GTK+
    
    Various GdkDrawable APIs have been replaced by GdkWindow ones,
    and GtkFunction is no more, use GSourceFunc instead.

 libnautilus-private/nautilus-icon-container.c      |    2 +-
 libnautilus-private/nautilus-tree-view-drag-dest.c |    2 +-
 src/nautilus-desktop-window.c                      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 0df550b..9083831 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -4164,7 +4164,7 @@ realize (GtkWidget *widget)
 	/* Ensure that the desktop window is native so the background
 	   set on it is drawn by X. */
 	if (container->details->is_desktop) {
-		gdk_x11_drawable_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget)));
+		gdk_x11_window_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget)));
 	}
 
 	/* Set up DnD.  */
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index f290d58..3b349fa 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -913,7 +913,7 @@ set_direct_save_uri (NautilusTreeViewDragDest *dest,
 			g_object_unref (child);
 
 			/* Change the property */
-			gdk_property_change (GDK_DRAWABLE (gdk_drag_context_get_source_window (context)),
+			gdk_property_change (gdk_drag_context_get_source_window (context),
 					     gdk_atom_intern (NAUTILUS_ICON_DND_XDNDDIRECTSAVE_TYPE, FALSE),
 					     gdk_atom_intern ("text/plain", FALSE), 8,
 					     GDK_PROP_MODE_REPLACE, (const guchar *) uri,
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 3799233..56a3d0e 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -214,7 +214,7 @@ set_desktop_window_id (NautilusDesktopWindow *window,
 	root_window = gdk_screen_get_root_window (
 				gtk_window_get_screen (GTK_WINDOW (window)));
 
-	window_xid = GDK_WINDOW_XWINDOW (gdkwindow);
+	window_xid = GDK_WINDOW_XID (gdkwindow);
 
 	gdk_property_change (root_window,
 			     gdk_atom_intern ("NAUTILUS_DESKTOP_WINDOW_ID", FALSE),



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]