Index: x11/gdkdnd-x11.c
===================================================================
--- x11/gdkdnd-x11.c	(revisjon 19731)
+++ x11/gdkdnd-x11.c	(arbeidskopi)
@@ -1895,11 +1895,11 @@
   GdkAtom atom;
   GdkDragAction action;
 } xdnd_actions_table[] = {
-    { "XdndActionCopy",    None, GDK_ACTION_COPY },
-    { "XdndActionMove",    None, GDK_ACTION_MOVE },
-    { "XdndActionLink",    None, GDK_ACTION_LINK },
-    { "XdndActionAsk",     None, GDK_ACTION_ASK  },
-    { "XdndActionPrivate", None, GDK_ACTION_COPY },
+    { "XdndActionCopy",    (GdkAtom)None, GDK_ACTION_COPY },
+    { "XdndActionMove",    (GdkAtom)None, GDK_ACTION_MOVE },
+    { "XdndActionLink",    (GdkAtom)None, GDK_ACTION_LINK },
+    { "XdndActionAsk",     (GdkAtom)None, GDK_ACTION_ASK  },
+    { "XdndActionPrivate", (GdkAtom)None, GDK_ACTION_COPY },
   };
 
 static const gint xdnd_n_actions = sizeof(xdnd_actions_table) / sizeof(xdnd_actions_table[0]);
Index: x11/gdkprivate-x11.h
===================================================================
--- x11/gdkprivate-x11.h	(revisjon 19731)
+++ x11/gdkprivate-x11.h	(arbeidskopi)
@@ -194,6 +194,7 @@
 extern const int         _gdk_event_mask_table[];
 extern GdkAtom		 _gdk_selection_property;
 extern gboolean          _gdk_synchronize;
+extern Display           *gdk_display;
 
 #define GDK_PIXMAP_SCREEN(pix)	      (GDK_DRAWABLE_IMPL_X11 (((GdkPixmapObject *)pix)->impl)->screen)
 #define GDK_PIXMAP_DISPLAY(pix)       (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->display)
Index: x11/gdkimage-x11.c
===================================================================
--- x11/gdkimage-x11.c	(revisjon 19731)
+++ x11/gdkimage-x11.c	(arbeidskopi)
@@ -620,7 +620,7 @@
 			req.x, req.y, req.width, req.height,
 			AllPlanes, ZPixmap,
 			private->ximage,
-			dest_x + req.x - src_x, dest_y + req.y - src_y) == None)
+			dest_x + req.x - src_x, dest_y + req.y - src_y) == (XImage *)None)
 	{
 	  if (created_image)
 	    g_object_unref (image);
Index: x11/gdkwindow-x11.c
===================================================================
--- x11/gdkwindow-x11.c	(revisjon 19731)
+++ x11/gdkwindow-x11.c	(arbeidskopi)
@@ -3547,7 +3547,7 @@
       Window w;
       
       w = XCreateWindow (xdisplay, xwindow, 0, 0, 1, 1, 0, 
-			 CopyFromParent, InputOnly, CopyFromParent, 
+			 CopyFromParent, InputOnly, (Visual *)CopyFromParent, 
 			 0, &attributes);
       XQueryPointer (xdisplay, w, 
 		     &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
@@ -3729,7 +3729,7 @@
 	      Window w;
 	      
 	      w = XCreateWindow (xdisplay, xwindow, winx, winy, 1, 1, 0, 
-				 CopyFromParent, InputOnly, CopyFromParent, 
+				 CopyFromParent, InputOnly, (Visual *)CopyFromParent, 
 				 0, &attributes);
 	      XMapWindow (xdisplay, w);
 	      XQueryPointer (xdisplay, xwindow, 
Index: x11/gdkselection-x11.c
===================================================================
--- x11/gdkselection-x11.c	(revisjon 19731)
+++ x11/gdkselection-x11.c	(arbeidskopi)
@@ -852,7 +852,7 @@
 	  g_error_free (error);
 
 	  if (encoding)
-	    *encoding = None;
+	    *encoding = (GdkAtom)None;
 	  if (format)
 	    *format = None;
 	  if (ctext)
