All _for_display function added now have the GdkDisplay arg as the first arg.

20 files changed, 123 insertions, 133 deletions

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 66599c33d..7ec169d60 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -104,7 +104,6 @@ GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
 				      gboolean      owner_events,
 				      guint32       time);
 void          gdk_keyboard_ungrab    (guint32       time);
-gboolean      gdk_pointer_is_grabbed_for_display (GdkDisplay * display);
 gboolean      gdk_pointer_is_grabbed (void);
 
 gint gdk_screen_width_for_screen (GdkScreen * screen);
@@ -117,7 +116,6 @@ gint gdk_screen_height_mm_for_screen (GdkScreen * screen);
 gint gdk_screen_height_mm (void) G_GNUC_CONST;
 
 void gdk_flush (void);
-void gdk_beep_for_display (GdkDisplay * display);
 
 void gdk_beep (void);
 
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 07aaa26d5..23aac5b4b 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -53,6 +53,7 @@ void		gdk_display_beep		(GdkDisplay * display);
 GdkAtom		gdk_display_atom		(GdkDisplay * dpy,
 						 const gchar * atom_name,
 						 gboolean only_if_exists);
+gchar *		gdk_display_atom_name		(GdkDisplay * dpy, GdkAtom atom);
 
 
 #ifdef __cplusplus
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index ec8f91d3a..02090f09a 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -98,11 +98,9 @@ GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
 
 GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
 				      GList          *targets);
-guint32         gdk_drag_get_protocol (guint32          xid,
+guint32         gdk_drag_get_protocol (GdkDisplay *display,
+				       guint32          xid,
 				       GdkDragProtocol *protocol);
-guint32	        gdk_drag_get_protocol_for_display (guint32 xid,
-						   GdkDisplay *display,
-						   GdkDragProtocol *protocol);
 void             gdk_drag_find_window (GdkDragContext   *context,
 				       GdkWindow       *drag_window,
 			 	       gint             x_root,
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 53d6d18bb..63f8fa5f1 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -246,3 +246,37 @@ gdk_display_atom (GdkDisplay * dpy,
   return retval;
 }
 
+
+gchar *
+gdk_display_atom_name (GdkDisplay * dpy, GdkAtom atom)
+{
+  gchar *t;
+  gchar *name;
+  gint old_error_warnings;
+
+  /*
+     If this atom doesn't exist, we'll die with an X error unless
+     we take precautions 
+   */
+
+  old_error_warnings = gdk_error_warnings;
+  gdk_error_warnings = 0;
+  gdk_error_code = 0;
+  t = XGetAtomName (GDK_DISPLAY_XDISPLAY (dpy), atom);
+  gdk_error_warnings = old_error_warnings;
+
+  if (gdk_error_code) {
+    if (t)
+      XFree (t);
+
+    return NULL;
+  }
+  else {
+    name = g_strdup (t);
+    if (t)
+      XFree (t);
+
+    return name;
+  }
+}
+
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 7a98ef8a9..1fa7ec768 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -778,8 +778,8 @@ print_target_list (GList *targets, GdkDisplay *display)
 {
   while (targets)
     {
-      gchar *name = gdk_atom_name_for_display (GPOINTER_TO_INT (targets->data),
-					       display);
+      gchar *name = gdk_display_atom_name (display, GPOINTER_TO_INT (targets->data));
+
       g_message ("\t%s", name);
       g_free (name);
       targets = targets->next;
@@ -2888,8 +2888,10 @@ gdk_drag_begin (GdkWindow     *window,
   return new_context;
 }
 
+
 guint32
-gdk_drag_get_protocol_for_display (guint32 xid, GdkDisplay *display,
+gdk_drag_get_protocol (GdkDisplay *display,
+		       guint32 xid,
 		       GdkDragProtocol *protocol)
 {
   guint32 retval;
@@ -2969,15 +2971,6 @@ gdk_drag_get_protocol_for_display (guint32 xid, GdkDisplay *display,
   *protocol = GDK_DRAG_PROTO_NONE;
   return GDK_NONE;
 }
-	
-
-guint32
-gdk_drag_get_protocol (guint32          xid,
-		       GdkDragProtocol *protocol)
-{
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_drag_get_protocol_for_display instead\n"));
-  return gdk_drag_get_protocol_for_display (xid, DEFAULT_GDK_DISPLAY, protocol);
-}
 
 void
 gdk_drag_find_window (GdkDragContext  *context,
@@ -3014,9 +3007,9 @@ gdk_drag_find_window (GdkDragContext  *context,
        * two are passed explicitely, the third implicitly through
        * protocol->dest_xid.
        */
-      if ((recipient = gdk_drag_get_protocol_for_display (dest, 
-			 GDK_WINDOW_DISPLAY(context->source_window),
-			 protocol)))
+      if ((recipient = gdk_drag_get_protocol (GDK_WINDOW_DISPLAY(context->source_window), 
+			 		      dest,
+			 		      protocol)))
 	{
 	  *dest_window = gdk_window_lookup (recipient);
 	  if (*dest_window)
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 18cef2fb9..113743c82 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1328,8 +1328,8 @@ gdk_event_translate (GdkEvent *event,
       
     case PropertyNotify:
       GDK_NOTE (EVENTS,
-		gchar *atom = gdk_atom_name_for_display (xevent->xproperty.atom,
-						    GDK_WINDOW_DISPLAY(window));
+		gchar *atom = gdk_display_atom_name (GDK_WINDOW_DISPLAY(window), xevent->xproperty.atom);
+
 		g_message ("property notify:\twindow: %ld, atom(%ld): %s%s%s",
 			   xevent->xproperty.window,
 			   xevent->xproperty.atom,
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 45e8ae0eb..9902621e0 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -43,44 +43,13 @@ gdk_atom_intern (const gchar *atom_name, gboolean only_if_exists)
   return gdk_display_atom (DEFAULT_GDK_DISPLAY, atom_name, only_if_exists);
 
 }
-gchar *
-gdk_atom_name_for_display (GdkAtom atom, GdkDisplay * dpy)
-{
-  gchar *t;
-  gchar *name;
-  gint old_error_warnings;
-
-  /*
-     If this atom doesn't exist, we'll die with an X error unless
-     we take precautions 
-   */
-
-  old_error_warnings = gdk_error_warnings;
-  gdk_error_warnings = 0;
-  gdk_error_code = 0;
-  t = XGetAtomName (GDK_DISPLAY_XDISPLAY (dpy), atom);
-  gdk_error_warnings = old_error_warnings;
-
-  if (gdk_error_code) {
-    if (t)
-      XFree (t);
-
-    return NULL;
-  }
-  else {
-    name = g_strdup (t);
-    if (t)
-      XFree (t);
-
-    return name;
-  }
-}
 
 gchar*
 gdk_atom_name (GdkAtom atom)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_atom_name_for_display instead\n"));
-  return gdk_atom_name_for_display(atom,DEFAULT_GDK_DISPLAY);	
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_atom_name instead\n"));
+  return gdk_display_atom_name (DEFAULT_GDK_DISPLAY, atom);	
+
 }
 
 gboolean
@@ -141,8 +110,10 @@ gdk_property_get (GdkWindow   *window,
       gchar *rn, *pn;
 
       XFree (ret_data);
-      rn = gdk_atom_name_for_display(ret_prop_type,GDK_WINDOW_DISPLAY(window));
-      pn = gdk_atom_name_for_display(type,GDK_WINDOW_DISPLAY(window));
+      rn = gdk_display_atom_name (GDK_WINDOW_DISPLAY(window), ret_prop_type);
+
+      pn = gdk_display_atom_name (GDK_WINDOW_DISPLAY(window), type);
+
       g_warning("Couldn't match property type %s to %s\n", rn, pn);
       g_free(rn); g_free(pn);
       return FALSE;
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 793c0f82d..7011e9448 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -105,7 +105,8 @@ static GQuark clipboards_owned_key_id = 0;
  **/
 
 GtkClipboard *
-gtk_clipboard_get_for_display (GdkAtom selection, GdkDisplay *display)
+gtk_clipboard_get_for_display (GdkDisplay *display, GdkAtom selection)
+
 {
   GtkClipboard *clipboard = NULL;
   GSList *tmp_list;
@@ -138,7 +139,8 @@ gtk_clipboard_get_for_display (GdkAtom selection, GdkDisplay *display)
 GtkClipboard *
 gtk_clipboard_get (GdkAtom selection)
 {
-  return gtk_clipboard_get_for_display(selection,DEFAULT_GDK_DISPLAY);
+  return gtk_clipboard_get_for_display (DEFAULT_GDK_DISPLAY, selection);
+
 }
 
 
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index 9ad5560fb..d8b53fb80 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -47,7 +47,8 @@ typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
 					       gpointer          user_data_or_owner);
 typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
 					       gpointer          user_data_or_owner);
-GtkClipboard *gtk_clipboard_get_for_display (GdkAtom selection, GdkDisplay *display);  
+GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay *display, GdkAtom selection);  
+
 GtkClipboard *gtk_clipboard_get (GdkAtom selection);
 
 gboolean gtk_clipboard_set_with_data  (GtkClipboard          *clipboard,
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index f9cb19eec..aaae0b5a6 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5284,8 +5284,8 @@ gtk_clist_motion (GtkWidget      *widget,
 	{
 	  GtkTargetList  *target_list;
 
-	  target_list = gtk_target_list_new_for_display (&clist_target_table,1,
-					       GTK_WIDGET_GET_DISPLAY(widget));
+	  target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(widget), &clist_target_table, 1);
+
 	  gtk_drag_begin (widget, target_list, GDK_ACTION_MOVE,
 			  clist->drag_button, (GdkEvent *)event);
 
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index d0736ce36..7e143737e 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -879,9 +879,8 @@ gtk_drag_dest_set   (GtkWidget            *widget,
   site->flags = flags;
   site->have_drag = FALSE;
   if (targets)
-    site->target_list = gtk_target_list_new_for_display (targets,
-							 n_targets,
-				    GTK_WIDGET_GET_DISPLAY(widget));
+    site->target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(widget), targets, n_targets);
+
   else
     site->target_list = NULL;
 
@@ -1385,8 +1384,8 @@ gtk_drag_proxy_begin (GtkWidget       *widget,
   source_info->ipc_widget = ipc_widget;
   source_info->widget = gtk_widget_ref (widget);
 
-  source_info->target_list = gtk_target_list_new_for_display (NULL, 0,
-				       GTK_WIDGET_GET_DISPLAY(widget));
+  source_info->target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(widget), NULL, 0);
+
   tmp_list = dest_info->context->targets;
   while (tmp_list)
     {
@@ -1926,8 +1925,8 @@ gtk_drag_source_set (GtkWidget            *widget,
   site->start_button_mask = start_button_mask;
 
   if (targets)
-    site->target_list = gtk_target_list_new_for_display (targets, n_targets,
-					    GTK_WIDGET_GET_DISPLAY(widget));
+    site->target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(widget), targets, n_targets);
+
   else
     site->target_list = NULL;
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index ad329d253..a3fbe36c8 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1455,9 +1455,8 @@ gtk_entry_motion_notify (GtkWidget      *widget,
 				    event->x + entry->scroll_offset, event->y))
 	{
 	  GdkDragContext *context;
-	  GtkTargetList *target_list = gtk_target_list_new_for_display (target_table,
-					    G_N_ELEMENTS (target_table),
-					    GTK_WIDGET_GET_DISPLAY(widget));
+	  GtkTargetList *target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(widget), target_table, G_N_ELEMENTS (target_table));
+
 	  
 	  context = gtk_drag_begin (widget, target_list, GDK_ACTION_COPY | GDK_ACTION_MOVE,
 			  entry->button, (GdkEvent *)event);
@@ -1964,8 +1963,8 @@ gtk_entry_copy_clipboard (GtkEntry *entry)
   if (gtk_editable_get_selection_bounds (editable, &start, &end))
     {
       gchar *str = gtk_entry_get_public_chars (entry, start, end);
-      gtk_clipboard_set_text (gtk_clipboard_get_for_display (GDK_NONE,
-				       GTK_WIDGET_GET_DISPLAY(entry)),
+      gtk_clipboard_set_text (gtk_clipboard_get_for_display (GTK_WIDGET_GET_DISPLAY(entry), GDK_NONE),
+
 		      str, -1);
       g_free (str);
     }
@@ -2859,8 +2858,8 @@ gtk_entry_paste (GtkEntry *entry,
 		 GdkAtom   selection)
 {
   g_object_ref (G_OBJECT (entry));
-  gtk_clipboard_request_text (gtk_clipboard_get_for_display (selection,
-					GTK_WIDGET_GET_DISPLAY(entry)),
+  gtk_clipboard_request_text (gtk_clipboard_get_for_display (GTK_WIDGET_GET_DISPLAY(entry), selection),
+
 			      paste_received, entry);
 }
 
@@ -2900,8 +2899,8 @@ gtk_entry_update_primary_selection (GtkEntry *entry)
     { "COMPOUND_TEXT", 0, 0 }
   };
   
-  GtkClipboard *clipboard = gtk_clipboard_get_for_display (GDK_SELECTION_PRIMARY,
-						    GTK_WIDGET_GET_DISPLAY(entry));
+  GtkClipboard *clipboard = gtk_clipboard_get_for_display (GTK_WIDGET_GET_DISPLAY(entry), GDK_SELECTION_PRIMARY);
+
   gint start, end;
   
   if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 6eb03f07c..786d71fc3 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1907,8 +1907,8 @@ gtk_label_select_region_index (GtkLabel *label,
       label->select_info->selection_anchor = anchor_index;
       label->select_info->selection_end = end_index;
 
-      clipboard = gtk_clipboard_get_for_display (GDK_SELECTION_PRIMARY,
-					GTK_WIDGET_GET_DISPLAY(label));      
+      clipboard = gtk_clipboard_get_for_display (GTK_WIDGET_GET_DISPLAY(label), GDK_SELECTION_PRIMARY);      
+
 
       if (anchor_index != end_index)
         {
diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 7aac9dfaa..de06f5a7d 100644
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -837,8 +837,8 @@ gtk_old_editable_real_copy_clipboard (GtkOldEditable *old_editable)
 
       if (text)
 	{
-	  gtk_clipboard_set_text (gtk_clipboard_get_for_display (GDK_NONE,
-				    GTK_WIDGET_GET_DISPLAY(old_editable)),
+	  gtk_clipboard_set_text (gtk_clipboard_get_for_display (GTK_WIDGET_GET_DISPLAY(old_editable), GDK_NONE),
+
 				  text, -1);
 	  g_free (text);
 	}
@@ -849,8 +849,8 @@ static void
 gtk_old_editable_real_paste_clipboard (GtkOldEditable *old_editable)
 {
   g_object_ref (G_OBJECT (old_editable));
-  gtk_clipboard_request_text (gtk_clipboard_get_for_display (GDK_NONE,
-				GTK_WIDGET_GET_DISPLAY(old_editable)),
+  gtk_clipboard_request_text (gtk_clipboard_get_for_display (GTK_WIDGET_GET_DISPLAY(old_editable), GDK_NONE),
+
 			      old_editable_text_received_cb, old_editable);
 }
 
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index f0a9513fb..f4500fd4e 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -189,16 +189,18 @@ static GSList *open_displays_cache = NULL;
 /*
  * Target lists
  */
-GtkTargetList *gtk_target_list_new_for_display(const GtkTargetEntry *targets,
-					       guint                 ntargets,
-					       GdkDisplay	    *display)
+GtkTargetList *gtk_target_list_new_for_display (GdkDisplay	     *display,
+						const GtkTargetEntry *targets,
+						guint                 ntargets)
+
 {
   GtkTargetList *result = g_new (GtkTargetList, 1);
   result->list = NULL;
   result->ref_count = 1;
 
   if (targets)
-    gtk_target_list_add_table_for_display (result, display, targets, ntargets);
+    gtk_target_list_add_table_for_display (display, result, targets, ntargets);
+
   
   return result;
 }
@@ -207,7 +209,8 @@ GtkTargetList *
 gtk_target_list_new (const GtkTargetEntry *targets,
 		     guint                 ntargets)
 {
-  return gtk_target_list_new_for_display(targets, ntargets, DEFAULT_GDK_DISPLAY);
+  return gtk_target_list_new_for_display (DEFAULT_GDK_DISPLAY, targets, ntargets);
+
 }
 
 void               
@@ -260,10 +263,11 @@ gtk_target_list_add (GtkTargetList *list,
 }
 
 void               
-gtk_target_list_add_table_for_display (GtkTargetList        *list,
-				       GdkDisplay	 *display,
-		   		       const GtkTargetEntry *targets,
+gtk_target_list_add_table_for_display (GdkDisplay	    *display, 
+				       GtkTargetList	    *list, 
+				       const GtkTargetEntry *targets, 
 				       guint                 ntargets)
+
 {
   gint i;
 
@@ -286,10 +290,8 @@ gtk_target_list_add_table (GtkTargetList        *list,
 			   guint                 ntargets)
 {
     g_message("Use gtk_target_list_add_table_for_display instead\n");
-    gtk_target_list_add_table_for_display (list,
-					   DEFAULT_GDK_DISPLAY,
-					   targets,
-					   ntargets);
+    gtk_target_list_add_table_for_display (DEFAULT_GDK_DISPLAY, list, targets, ntargets);
+
 }
 
 void 
@@ -498,8 +500,8 @@ gtk_selection_target_list_get (GtkWidget    *widget,
 
   sellist = g_new (GtkSelectionTargetList, 1);
   sellist->selection = selection;
-  sellist->list = gtk_target_list_new_for_display (NULL, 0,
-			    GTK_WIDGET_GET_DISPLAY(widget));
+  sellist->list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(widget), NULL, 0);
+
 
   lists = g_list_prepend (lists, sellist);
   gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, lists);
@@ -594,10 +596,8 @@ gtk_selection_add_targets (GtkWidget            *widget,
   g_return_if_fail (targets != NULL);
   
   list = gtk_selection_target_list_get (widget, selection);
-  gtk_target_list_add_table_for_display (list,
-  					 GTK_WIDGET_GET_DISPLAY(widget),
-					 targets,
-					 ntargets);
+  gtk_target_list_add_table_for_display (GTK_WIDGET_GET_DISPLAY(widget), list, targets, ntargets);
+
 }
 
 
@@ -1133,8 +1133,8 @@ gtk_selection_request (GtkWidget *widget,
 #ifdef DEBUG_SELECTION
       g_message ("Selection %ld, target %ld (%s) requested by 0x%x (property = %ld)",
 		 event->selection, info->conversions[i].target,
-		 gdk_atom_name_for_display (info->conversions[i].target,
-					GTK_WIDGET_GET_DISPLAY(widget)),
+		 gdk_display_atom_name (GTK_WIDGET_GET_DISPLAY(widget), info->conversions[i].target),
+
 		 event->requestor, event->property);
 #endif
       
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index 2ce3140ed..2258dbe25 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -85,9 +85,8 @@ struct _GtkTargetPair {
   guint     info;
 };
 
-GtkTargetList *gtk_target_list_new_for_display(const GtkTargetEntry *targets,
-					       guint                 ntargets,
-					       GdkDisplay	    *display);
+GtkTargetList *gtk_target_list_new_for_display (GdkDisplay    *display, const GtkTargetEntry *targets, guint                 ntargets);
+
 GtkTargetList *gtk_target_list_new       (const GtkTargetEntry *targets,
 					  guint                 ntargets);
 void           gtk_target_list_ref       (GtkTargetList  *list);
@@ -96,10 +95,8 @@ void           gtk_target_list_add       (GtkTargetList  *list,
 				  	  GdkAtom         target,
 					  guint           flags,
 					  guint           info);
-void           gtk_target_list_add_table_for_display (GtkTargetList *list,
-						      GdkDisplay *display,
-						      const GtkTargetEntry *targets,
-						      guint ntargets);
+void           gtk_target_list_add_table_for_display (GdkDisplay *display, GtkTargetList *list, const GtkTargetEntry *targets, guint ntargets);
+
 void           gtk_target_list_add_table (GtkTargetList        *list,
 					  const GtkTargetEntry *targets,
 					  guint                 ntargets);
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 9a163a36e..a936605d9 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -856,8 +856,7 @@ gtk_socket_add_window (GtkSocket *socket, GdkNativeWindow xid)
 		    GDK_WINDOW_XWINDOW(socket->plug_window),
 		    StructureNotifyMask | PropertyChangeMask);
       
-      if (gdk_drag_get_protocol_for_display (xid,
-	   GDK_WINDOW_DISPLAY(socket->plug_window),&protocol))
+      if (gdk_drag_get_protocol (GDK_WINDOW_DISPLAY(socket->plug_window), xid, &protocol))
 	gtk_drag_dest_set_proxy (GTK_WIDGET (socket), socket->plug_window, 
 				 protocol, TRUE);
       gdk_flush ();
@@ -1134,8 +1133,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 
 	    {
 	      gdk_error_trap_push ();
-	      if (gdk_drag_get_protocol_for_display (xevent->xproperty.window,
-			GDK_WINDOW_DISPLAY(socket->plug_window),&protocol))
+	      if (gdk_drag_get_protocol (GDK_WINDOW_DISPLAY(socket->plug_window),
+					 xevent->xproperty.window,&protocol))
 		gtk_drag_dest_set_proxy (GTK_WIDGET (socket),
 					 socket->plug_window,
 					 protocol, TRUE);
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index ceb38920a..bb0acc540 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -2851,8 +2851,8 @@ gtk_text_buffer_update_primary_selection (GtkTextBuffer *buffer)
   GtkTextIter start;
   GtkTextIter end;
 
-  GtkClipboard *clipboard = gtk_clipboard_get_for_display (GDK_SELECTION_PRIMARY,
-						      buffer->clipboard_display);
+  GtkClipboard *clipboard = gtk_clipboard_get_for_display (buffer->clipboard_display, GDK_SELECTION_PRIMARY);
+
 
   /* Determine whether we have a selection and adjust X selection
    * accordingly.
@@ -2907,13 +2907,14 @@ paste (GtkTextBuffer *buffer,
     data->replace_selection = TRUE;
 
   if (is_clipboard)
-    gtk_clipboard_request_contents (gtk_clipboard_get_for_display (GDK_NONE, display),
+    gtk_clipboard_request_contents (gtk_clipboard_get_for_display (display, GDK_NONE),
+
                                     gdk_display_atom (display, "GTK_TEXT_BUFFER_CONTENTS", FALSE),
 
                                     clipboard_clipboard_buffer_received, data);
   else
-    gtk_clipboard_request_contents (gtk_clipboard_get_for_display (GDK_SELECTION_PRIMARY,
-								   display),
+    gtk_clipboard_request_contents (gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY),
+
                                     gdk_display_atom (display, "GTK_TEXT_BUFFER_CONTENTS", FALSE),
 
                                     clipboard_selection_buffer_received, data);    
@@ -3039,8 +3040,8 @@ cut_or_copy (GtkTextBuffer *buffer,
 
   if (!gtk_text_iter_equal (&start, &end))
     {
-      GtkClipboard *clipboard = gtk_clipboard_get_for_display (GDK_NONE, 
-					     buffer->clipboard_display);
+      GtkClipboard *clipboard = gtk_clipboard_get_for_display (buffer->clipboard_display, GDK_NONE);
+
       GtkTextIter ins;
       
       buffer->clipboard_contents =
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index e8c14eff4..84e55bb44 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4434,9 +4434,8 @@ gtk_text_view_start_selection_dnd (GtkTextView       *text_view,
   text_view->drag_start_x = -1;
   text_view->drag_start_y = -1;
 
-  target_list = gtk_target_list_new_for_display (target_table,
-                                     G_N_ELEMENTS (target_table),
-				     GTK_WIDGET_GET_DISPLAY(text_view));
+  target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(text_view), target_table, G_N_ELEMENTS (target_table));
+
 
   context = gtk_drag_begin (GTK_WIDGET (text_view), target_list,
                             GDK_ACTION_COPY | GDK_ACTION_MOVE,
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 42c34d1f1..213544668 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -7378,9 +7378,8 @@ gtk_tree_view_set_rows_drag_source (GtkTreeView              *tree_view,
   clear_source_info (di);
 
   di->start_button_mask = start_button_mask;
-  di->source_target_list = gtk_target_list_new_for_display (targets,
-							    n_targets,
-				    GTK_WIDGET_GET_DISPLAY(tree_view));
+  di->source_target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(tree_view), targets, n_targets);
+
   di->source_actions = actions;
 
   if (row_draggable_func)
@@ -7416,9 +7415,8 @@ gtk_tree_view_set_rows_drag_dest (GtkTreeView              *tree_view,
   clear_dest_info (di);
 
   if (targets)
-    di->dest_target_list = gtk_target_list_new_for_display (targets, 
-							    n_targets,
-				    GTK_WIDGET_GET_DISPLAY(tree_view));
+    di->dest_target_list = gtk_target_list_new_for_display (GTK_WIDGET_GET_DISPLAY(tree_view), targets, n_targets);
+
 
   if (location_droppable_func)
     {