replaced gdk.h:void gdk_set_use_xshm_for_display (GdkDisplay * display,

replaced
gdk.h:void    gdk_set_use_xshm_for_display  (GdkDisplay * display, gboolean use_xshm);
gdk.h:gboolean  gdk_get_use_xshm_for_display  (GdkDisplay * display);
gdk.h:void        gdk_pointer_ungrab_for_display (GdkDisplay * display,
gdk.h:void        gdk_keyboard_ungrab_for_display (GdkDisplay * display,
gdk.h:gboolean      gdk_pointer_is_grabbed_for_display (GdkDisplay * display);
gdk.h:void gdk_beep_for_display (GdkDisplay * display);

by

void	gdk_display_use_xshm_set  (GdkDisplay *display, gboolean use_xshm);
gboolean        gdk_display_use_xshm_get        (GdkDisplay * display);
void          gdk_display_pointer_ungrab      (GdkDisplay * display, guint32 time);
void          gdk_display_keyboard_ungrab (GdkDisplay * display, guint32 time);
gboolean        gdk_display_is_pointer_grabbed  (GdkDisplay * display);
void	gdk_display_beep    (GdkDisplay * display);

25 files changed, 128 insertions, 122 deletions

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 8b3db7af4..66599c33d 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -75,11 +75,7 @@ gchar*	  gdk_set_locale	   	(void);
  */
 void      gdk_error_trap_push           (void);
 gint      gdk_error_trap_pop            (void);
-
-void	  gdk_set_use_xshm_for_display  (GdkDisplay * display, gboolean use_xshm);
 void	  gdk_set_use_xshm		(gboolean	 use_xshm);
-
-gboolean  gdk_get_use_xshm_for_display  (GdkDisplay * display);
 gboolean  gdk_get_use_xshm		(void);
 gchar*	  gdk_get_display		(void);
 gchar*	  gdk_get_display_arg_name	(void);
@@ -103,14 +99,10 @@ GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
 				      GdkWindow    *confine_to,
 				      GdkCursor    *cursor,
 				      guint32       time);
-void	      gdk_pointer_ungrab_for_display (GdkDisplay * display, 
-					      guint32 time);
 void          gdk_pointer_ungrab     (guint32       time);
 GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
 				      gboolean      owner_events,
 				      guint32       time);
-void	      gdk_keyboard_ungrab_for_display (GdkDisplay * display, 
-					       guint32 time);
 void          gdk_keyboard_ungrab    (guint32       time);
 gboolean      gdk_pointer_is_grabbed_for_display (GdkDisplay * display);
 gboolean      gdk_pointer_is_grabbed (void);
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index f9ce8bffc..703b8b2aa 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -40,9 +40,17 @@ gdk_display_init_new(int argc, char **argv, char *display_name);
 GdkDisplay *	gdk_display_new			(gchar * display_name);	    
 gchar *		gdk_display_get_name		(GdkDisplay *dpy);	    
 gint		gdk_display_get_n_screens	(GdkDisplay *dpy);	    
-GdkScreen *	gdk_display_get_screen		(GdkDisplay *dpy,gint screen_num);
+GdkScreen *	gdk_display_get_screen		(GdkDisplay *dpy, gint screen_num);
 GdkScreen *	gdk_display_get_default_screen	(GdkDisplay *dpy);	  
 
+void		gdk_display_use_xshm_set	(GdkDisplay *display, gboolean use_xshm);
+gboolean        gdk_display_use_xshm_get        (GdkDisplay * display);
+void	        gdk_display_pointer_ungrab      (GdkDisplay * display, guint32 time);
+void	        gdk_display_keyboard_ungrab	(GdkDisplay * display, guint32 time);
+gboolean        gdk_display_is_pointer_grabbed  (GdkDisplay * display);
+void		gdk_display_beep		(GdkDisplay * display);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index dfcaa65b8..36a0005d5 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -145,3 +145,45 @@ gboolean gdk_x11_display_impl_is_root_window(GdkDisplay *dpy, Window root_window
   }
   return FALSE;
 }
+
+void
+gdk_display_use_xshm_set (GdkDisplay * display, gboolean use_xshm)
+{
+  GDK_DISPLAY_IMPL_X11 (display)->gdk_use_xshm = use_xshm;
+}
+
+gboolean
+gdk_display_use_xshm_get (GdkDisplay * display)
+{
+  return GDK_DISPLAY_IMPL_X11 (display)->gdk_use_xshm;
+}
+
+
+void
+gdk_display_pointer_ungrab (GdkDisplay * display, guint32 time)
+{
+  _gdk_input_ungrab_pointer (time);
+
+  XUngrabPointer (GDK_DISPLAY_XDISPLAY (display), time);
+  GDK_DISPLAY_IMPL_X11 (display)->gdk_xgrab_window = NULL;
+}
+
+
+gboolean
+gdk_display_is_pointer_grabbed (GdkDisplay * display)
+{
+  return (GDK_DISPLAY_IMPL_X11 (display)->gdk_xgrab_window != NULL);
+}
+
+void
+gdk_display_keyboard_ungrab (GdkDisplay * display, guint32 time)
+{
+  XUngrabKeyboard (GDK_DISPLAY_XDISPLAY (display), time);
+}
+
+void
+gdk_display_beep (GdkDisplay * display)
+{
+  XBell (GDK_DISPLAY_XDISPLAY (display), 0);
+}
+
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index de832c6bb..ed0258e17 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -247,31 +247,20 @@ gdk_display_init_new(int argc, char **argv, char *display_name){
   return dpy;
 }
 
-void
-gdk_set_use_xshm_for_display (GdkDisplay * display, gboolean use_xshm)
-{
-  GDK_DISPLAY_IMPL_X11 (display)->gdk_use_xshm = use_xshm;
-}
-
-gboolean
-gdk_get_use_xshm_for_display (GdkDisplay * display)
-{
-  return GDK_DISPLAY_IMPL_X11 (display)->gdk_use_xshm;
-}
 
 
 void
 gdk_set_use_xshm (gboolean use_xshm)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_set_use_xshm_for_display instead\n"));
-  gdk_set_use_xshm_for_display(DEFAULT_GDK_DISPLAY,use_xshm);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_use_xshm_set instead\n"));
+  gdk_display_use_xshm_set (DEFAULT_GDK_DISPLAY,use_xshm);
 }
 
 gboolean
 gdk_get_use_xshm (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_get_use_xshm_for_display instead\n"));
-  return gdk_get_use_xshm_for_display(DEFAULT_GDK_DISPLAY);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_use_xshm_get instead\n"));
+  return gdk_display_use_xshm_get (DEFAULT_GDK_DISPLAY);
 }
 
 static GdkGrabStatus
@@ -389,16 +378,6 @@ gdk_pointer_grab (GdkWindow *	  window,
   return gdk_x11_convert_grab_status (return_val);
 }
 
-void
-gdk_pointer_ungrab_for_display (GdkDisplay * display, guint32 time)
-{
-  _gdk_input_ungrab_pointer (time);
-
-
-  XUngrabPointer (GDK_DISPLAY_XDISPLAY (display), time);
-  GDK_DISPLAY_IMPL_X11 (display)->gdk_xgrab_window = NULL;
-}
-
 /*
  *--------------------------------------------------------------
  * gdk_pointer_ungrab
@@ -417,8 +396,8 @@ gdk_pointer_ungrab_for_display (GdkDisplay * display, guint32 time)
 void
 gdk_pointer_ungrab (guint32 time)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_pointer_ungrab_for_display instead\n"));
-  gdk_pointer_ungrab_for_display(DEFAULT_GDK_DISPLAY,time);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_pointer_ungrab instead\n"));
+  gdk_display_pointer_ungrab (DEFAULT_GDK_DISPLAY,time);
 }
 
 /*
@@ -439,13 +418,8 @@ gdk_pointer_ungrab (guint32 time)
 gboolean
 gdk_pointer_is_grabbed (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_pointer_is_grabbed_for_display instead\n"));
-  return gdk_pointer_is_grabbed_for_display(DEFAULT_GDK_DISPLAY);
-}
-gboolean
-gdk_pointer_is_grabbed_for_display (GdkDisplay * display)
-{
-  return (GDK_DISPLAY_IMPL_X11 (display)->gdk_xgrab_window != NULL);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_is_pointer_grabbed instead\n"));
+  return gdk_display_is_pointer_grabbed (DEFAULT_GDK_DISPLAY);
 }
 
 
@@ -491,11 +465,6 @@ gdk_keyboard_grab (GdkWindow *	   window,
   return gdk_x11_convert_grab_status (return_val);
 }
 
-void
-gdk_keyboard_ungrab_for_display (GdkDisplay * display, guint32 time)
-{
-  XUngrabKeyboard (GDK_DISPLAY_XDISPLAY (display), time);
-}
 
 
 /*
@@ -516,8 +485,8 @@ gdk_keyboard_ungrab_for_display (GdkDisplay * display, guint32 time)
 void
 gdk_keyboard_ungrab (guint32 time)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_keyboard_ungrab_for_display instead\n"));	 
-  gdk_keyboard_ungrab_for_display(DEFAULT_GDK_DISPLAY,time);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_keyboard_ungrab instead\n"));	 
+  gdk_display_keyboard_ungrab (DEFAULT_GDK_DISPLAY,time);
 }
 
 /*
@@ -713,17 +682,12 @@ gdk_key_repeat_restore (void)
 
 */
 
-void
-gdk_beep_for_display (GdkDisplay * display)
-{
-  XBell (GDK_DISPLAY_XDISPLAY (display), 0);
-}
 
 void
 gdk_beep (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_beep_for_display instead\n"));
-  gdk_beep_for_display(DEFAULT_GDK_DISPLAY);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_beep instead\n"));
+  gdk_display_beep (DEFAULT_GDK_DISPLAY);
 }
 
 /* close all open display */
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index ef58c3da1..27e12eae1 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -3551,7 +3551,7 @@ wmspec_moveresize (GdkWindow *window,
   XEvent xev;
 
   /* Release passive grab */
-  gdk_pointer_ungrab_for_display (GDK_WINDOW_DISPLAY(window),timestamp);
+  gdk_display_pointer_ungrab (GDK_WINDOW_DISPLAY(window),timestamp);
   
   xev.xclient.type = ClientMessage;
   xev.xclient.serial = 0;
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 0e1dd1fa9..75cae4746 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1071,7 +1071,7 @@ gtk_button_finish_activate (GtkButton *button,
   g_source_remove (button->activate_timeout);
   button->activate_timeout = 0;
 
-  gdk_keyboard_ungrab_for_display(gdk_window_get_display(widget->window),
+  gdk_display_keyboard_ungrab(gdk_window_get_display(widget->window),
 				  gtk_get_current_event_time ());
   gtk_grab_remove (widget);
 
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index efa17480b..fdff838b3 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1878,7 +1878,7 @@ abort_column_resize (GtkCList *clist)
 
   GTK_CLIST_UNSET_FLAG (clist, CLIST_IN_DRAG);
   gtk_grab_remove (GTK_WIDGET (clist));
-  gdk_pointer_ungrab_for_display (
+  gdk_display_pointer_ungrab (
 		      gdk_window_get_display(GTK_WIDGET(clist)->window),
 		      GDK_CURRENT_TIME);
   clist->drag_pos = -1;
@@ -3614,7 +3614,7 @@ toggle_focus_row (GtkCList *clist)
   g_return_if_fail (clist != 0);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->focus_row < 0 || 
@@ -3655,7 +3655,7 @@ toggle_add_mode (GtkCList *clist)
   g_return_if_fail (clist != 0);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
       GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->selection_mode != GTK_SELECTION_EXTENDED)
@@ -3785,7 +3785,7 @@ real_select_all (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
@@ -3835,7 +3835,7 @@ real_unselect_all (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
@@ -3923,7 +3923,7 @@ real_undo_selection (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
        GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->selection_mode != GTK_SELECTION_EXTENDED)
@@ -4279,7 +4279,7 @@ start_selection (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
@@ -4294,7 +4294,7 @@ end_selection (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
       GTK_WIDGET_HAS_FOCUS(clist))
     return;
@@ -4311,7 +4311,7 @@ extend_selection (GtkCList      *clist,
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
        GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->selection_mode != GTK_SELECTION_EXTENDED)
@@ -4752,7 +4752,7 @@ gtk_clist_unmap (GtkWidget *widget)
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
-      if (gdk_pointer_is_grabbed_for_display (
+      if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
 	 GTK_WIDGET_HAS_GRAB (clist))
 	{
@@ -5134,7 +5134,7 @@ gtk_clist_button_release (GtkWidget      *widget,
       GTK_CLIST_UNSET_FLAG (clist, CLIST_IN_DRAG);
       gtk_widget_get_pointer (widget, &x, NULL);
       gtk_grab_remove (widget);
-      gdk_pointer_ungrab_for_display (gdk_window_get_display(widget->window),
+      gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
 				      event->time);
 
       if (clist->x_drag >= 0)
@@ -5212,7 +5212,7 @@ gtk_clist_motion (GtkWidget      *widget,
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
 
   clist = GTK_CLIST (widget);
-  if (!(gdk_pointer_is_grabbed_for_display (
+  if (!(gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
 	GTK_WIDGET_HAS_GRAB (clist)))
     return FALSE;
@@ -6842,7 +6842,7 @@ scroll_horizontal (GtkCList      *clist,
   g_return_if_fail (clist != 0);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
@@ -6919,7 +6919,7 @@ scroll_vertical (GtkCList      *clist,
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
@@ -7095,9 +7095,9 @@ remove_grab (GtkCList *clist)
   if (GTK_WIDGET_HAS_GRAB (clist))
     {
       gtk_grab_remove (GTK_WIDGET (clist));
-      if (gdk_pointer_is_grabbed_for_display (
+      if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)))
-	gdk_pointer_ungrab_for_display (
+	gdk_display_pointer_ungrab (
 	     gdk_window_get_display(GTK_WIDGET(clist)->window),
 	     GDK_CURRENT_TIME);
     }
@@ -7243,7 +7243,7 @@ real_sort_list (GtkCList *clist)
   if (clist->rows <= 1)
     return;
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
       GTK_WIDGET_HAS_GRAB (clist))
     return;
@@ -7842,7 +7842,7 @@ gtk_clist_set_button_actions (GtkCList *clist,
   
   if (button < MAX_BUTTON)
     {
-      if (gdk_pointer_is_grabbed_for_display (
+      if (gdk_display_is_pointer_grabbed (
 	    gdk_window_get_display(GTK_WIDGET(clist)->window)) || 
 	  GTK_WIDGET_HAS_GRAB (clist))
 	{
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index ff80f3c38..532047709 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1118,9 +1118,9 @@ shutdown_eyedropper (GtkWidget *widget)
   colorsel = GTK_COLOR_SELECTION (widget);
   priv = colorsel->private_data;    
 
-  gdk_keyboard_ungrab_for_display (gdk_window_get_display(widget->window),
+  gdk_display_keyboard_ungrab (gdk_window_get_display(widget->window),
 				   gtk_get_current_event_time ());
-  gdk_pointer_ungrab_for_display (gdk_window_get_display(widget->window),
+  gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
 				  gtk_get_current_event_time ());
   gtk_grab_remove (priv->dropper_grab_widget);
 }
@@ -1252,7 +1252,7 @@ get_screen_color (GtkWidget *button)
                         picker_cursor,
                         gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
     {
-      gdk_keyboard_ungrab_for_display(gdk_window_get_display(button->window),GDK_CURRENT_TIME);
+      gdk_display_keyboard_ungrab(gdk_window_get_display(button->window),GDK_CURRENT_TIME);
       g_warning ("Failed to grab pointer to do eyedropper");
       return;
     }
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index dcbe6cc9e..fbf3de27b 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -269,7 +269,7 @@ gtk_combo_window_key_press (GtkWidget   *window,
 	  if (GTK_WIDGET_HAS_GRAB (combo->popwin))
 	    {
 	      gtk_grab_remove (combo->popwin);
-	      gdk_pointer_ungrab_for_display (
+	      gdk_display_pointer_ungrab (
 			gdk_window_get_display(window->window),
 			event->time);
 	    }
@@ -593,7 +593,7 @@ gtk_combo_button_press (GtkWidget * widget, GdkEvent * event, GtkCombo * combo)
 
   gtk_widget_hide (combo->popwin);
   gtk_grab_remove (combo->popwin);
-  gdk_pointer_ungrab_for_display (gdk_window_get_display(widget->window),
+  gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
 				  event->button.time);
 
   return TRUE;
@@ -662,7 +662,7 @@ gtk_combo_button_release (GtkWidget *widget,
       if (GTK_WIDGET_HAS_GRAB (combo->popwin))
 	{
 	  gtk_grab_remove (combo->popwin);
-	  gdk_pointer_ungrab_for_display (
+	  gdk_display_pointer_ungrab (
 		gdk_window_get_display(combo->button->window),
 		event->button.time);
 	}
@@ -723,7 +723,7 @@ gtk_combo_list_key_press (GtkWidget * widget, GdkEventKey * event, GtkCombo * co
       if (GTK_WIDGET_HAS_GRAB (combo->popwin))
 	{
 	  gtk_grab_remove (combo->popwin);
-	  gdk_pointer_ungrab_for_display (gdk_window_get_display(widget->window),
+	  gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
 					  GDK_CURRENT_TIME);
 	}
       else if (GTK_WIDGET_HAS_GRAB (combo->list))
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 120f53f8e..11a888f1b 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -2478,7 +2478,7 @@ change_focus_row_expansion (GtkCTree          *ctree,
 
   clist = GTK_CLIST (ctree);
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 		gdk_window_get_display(GTK_WIDGET(ctree)->window)) && 
       GTK_WIDGET_HAS_GRAB (ctree))
     return;
@@ -4815,12 +4815,12 @@ gtk_ctree_node_set_shift (GtkCTree     *ctree,
 static void
 remove_grab (GtkCList *clist)
 {
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 		gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     {
       gtk_grab_remove (GTK_WIDGET (clist));
-      gdk_pointer_ungrab_for_display (
+      gdk_display_pointer_ungrab (
 		      gdk_window_get_display(GTK_WIDGET(clist)->window),
 		      GDK_CURRENT_TIME);
     }
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0848e040e..1fd0e70f9 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2823,9 +2823,9 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
   GtkWidget *source_widget = info->widget;
   GdkWindow *root_parent = gdk_screen_get_parent_root(source_widget->screen);
 
-  gdk_pointer_ungrab_for_display (gdk_window_get_display(source_widget->window),
+  gdk_display_pointer_ungrab (gdk_window_get_display(source_widget->window),
 				  time);
-  gdk_keyboard_ungrab_for_display(gdk_window_get_display(source_widget->window),
+  gdk_display_keyboard_ungrab(gdk_window_get_display(source_widget->window),
 				  time);
   gtk_grab_remove (info->ipc_widget);
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7e8b050bc..ad329d253 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1736,7 +1736,7 @@ gtk_entry_real_insert_text (GtkEntry    *entry,
   n_chars = g_utf8_strlen (new_text, new_text_length);
   if (entry->text_max_length > 0 && n_chars + entry->text_length > entry->text_max_length)
     {
-      gdk_beep_for_display (gdk_window_get_display(GTK_WIDGET(entry)->window));
+      gdk_display_beep (gdk_window_get_display(GTK_WIDGET(entry)->window));
       n_chars = entry->text_max_length - entry->text_length;
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index b6d15268d..2d45147c9 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1395,7 +1395,7 @@ gtk_file_selection_insert_text (GtkWidget   *widget,
 
   if (!filename)
     {
-      gdk_beep_for_display (gdk_window_get_display(widget->window));
+      gdk_display_beep (gdk_window_get_display(widget->window));
       gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "insert_text");
       return FALSE;
     }
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 0fd3c8a6c..7cd4b2c8c 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -999,7 +999,7 @@ gtk_handle_box_button_changed (GtkWidget      *widget,
       if (event->window != widget->window)
 	return FALSE;
       
-      gdk_pointer_ungrab_for_display (gdk_window_get_display(event->window),
+      gdk_display_pointer_ungrab (gdk_window_get_display(event->window),
 				      GDK_CURRENT_TIME);
       hb->in_drag = FALSE;
       event_handled = TRUE;
@@ -1253,7 +1253,7 @@ gtk_handle_box_reattach (GtkHandleBox *hb)
     }
   if (hb->in_drag)
     {
-      gdk_pointer_ungrab_for_display (
+      gdk_display_pointer_ungrab (
 		      gdk_window_get_display(GTK_WIDGET(hb)->window),
 		      GDK_CURRENT_TIME);
       hb->in_drag = FALSE;
diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index db1e344a5..8f84511e5 100644
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -362,7 +362,7 @@ gtk_hpaned_button_release (GtkWidget      *widget,
       gtk_hpaned_xor_line (paned);
       paned->in_drag = FALSE;
       paned->position_set = TRUE;
-      gdk_pointer_ungrab_for_display (gdk_window_get_display(widget->window),
+      gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
 				      event->time);
       gtk_widget_queue_resize (GTK_WIDGET (paned));
       g_object_freeze_notify (object);
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 428941b48..1ae39ea63 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -856,7 +856,7 @@ gtk_hsv_button_release (GtkWidget      *widget,
   } else
     g_assert_not_reached ();
   
-  gdk_pointer_ungrab_for_display (gdk_window_get_display(event->window),
+  gdk_display_pointer_ungrab (gdk_window_get_display(event->window),
 				  event->time);
   return TRUE;
 }
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 5d35adf28..a1f26c003 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -1035,7 +1035,7 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
       context_simple->compose_buffer[0] = 0;
       if (n_compose > 1)		/* Invalid sequence */
 	{
-	  gdk_beep_for_display (gdk_window_get_display(event->window));
+	  gdk_display_beep (gdk_window_get_display(event->window));
 	  return TRUE;
 	}
   
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 6b2af0924..6eb03f07c 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -468,7 +468,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
 
   /* barf if there was nothing to activate */
   g_warning ("Couldn't find a target for a mnemonic activation.");
-  gdk_beep_for_display (gdk_window_get_display(widget->window));
+  gdk_display_beep (gdk_window_get_display(widget->window));
   
   return FALSE;
 }
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 1e3c7c60e..31862515c 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -524,7 +524,7 @@ gtk_list_unmap (GtkWidget *widget)
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 			  gdk_window_get_display(widget->window)) &&
       GTK_WIDGET_HAS_GRAB (list))
     {
@@ -679,7 +679,7 @@ gtk_list_button_press (GtkWidget      *widget,
 	  gtk_grab_add (widget);
 	  list->drag_selection = TRUE;
 	}
-      else if (gdk_pointer_is_grabbed_for_display (
+      else if (gdk_display_is_pointer_grabbed (
 			  gdk_window_get_display(widget->window)) && 
 	       GTK_WIDGET_HAS_GRAB (list))
 	gtk_list_end_drag_selection (list);
@@ -1516,7 +1516,7 @@ gtk_list_select_all (GtkList *list)
   if (!list->children)
     return;
   
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
       GTK_WIDGET_HAS_GRAB (list))
     gtk_list_end_drag_selection (list);
@@ -1577,7 +1577,7 @@ gtk_list_unselect_all (GtkList *list)
   if (!list->children)
     return;
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) &&
       GTK_WIDGET_HAS_GRAB (list))
     gtk_list_end_drag_selection (list);
@@ -1624,7 +1624,7 @@ gtk_list_extend_selection (GtkList       *list,
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) &&
       GTK_WIDGET_HAS_GRAB (list)) ||
       list->selection_mode != GTK_SELECTION_EXTENDED)
@@ -1679,7 +1679,7 @@ gtk_list_start_selection (GtkList *list)
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
       GTK_WIDGET_HAS_GRAB (list))
     return;
@@ -1705,7 +1705,7 @@ gtk_list_end_selection (GtkList *list)
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
        GTK_WIDGET_HAS_GRAB (list)) ||
       list->anchor < 0)
@@ -1831,7 +1831,7 @@ gtk_list_toggle_focus_row (GtkList *list)
 
   container = GTK_CONTAINER (list);
 
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
       GTK_WIDGET_HAS_GRAB (list)) ||
       !container->focus_child)
@@ -1877,7 +1877,7 @@ gtk_list_toggle_add_mode (GtkList *list)
   g_return_if_fail (list != 0);
   g_return_if_fail (GTK_IS_LIST (list));
   
-  if ((gdk_pointer_is_grabbed_for_display (
+  if ((gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
       GTK_WIDGET_HAS_GRAB (list)) ||
       list->selection_mode != GTK_SELECTION_EXTENDED)
@@ -1906,7 +1906,7 @@ gtk_list_undo_selection (GtkList *list)
   g_return_if_fail (GTK_IS_LIST (list));
 
   if (list->selection_mode != GTK_SELECTION_EXTENDED ||
-      (gdk_pointer_is_grabbed_for_display (
+      (gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
        GTK_WIDGET_HAS_GRAB (list)))
     return;
@@ -2189,7 +2189,7 @@ gtk_list_scroll_horizontal (GtkList       *list,
   g_return_if_fail (list != 0);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
       GTK_WIDGET_HAS_GRAB (list))
     return;
@@ -2238,7 +2238,7 @@ gtk_list_scroll_vertical (GtkList       *list,
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if (gdk_pointer_is_grabbed_for_display (
+  if (gdk_display_is_pointer_grabbed (
 	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
       GTK_WIDGET_HAS_GRAB (list))
     return;
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b018c95a0..f7fc851bb 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -599,7 +599,7 @@ gtk_menu_popup (GtkMenu		    *menu,
                                  activate_time) == 0)
 	    GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE;
 	  else
-	    gdk_pointer_ungrab_for_display (
+	    gdk_display_pointer_ungrab (
 		 gdk_window_get_display(xgrab_shell->window),activate_time);
 	}
     }
@@ -658,10 +658,10 @@ gtk_menu_popdown (GtkMenu *menu)
 	   */
 	  if (menu_shell->have_xgrab)
 	    {
-	      gdk_pointer_ungrab_for_display (
+	      gdk_display_pointer_ungrab (
 		     gdk_window_get_display(menu->tearoff_window->window),
 		     GDK_CURRENT_TIME);
-	      gdk_keyboard_ungrab_for_display (
+	      gdk_display_keyboard_ungrab (
 		     gdk_window_get_display(menu->tearoff_window->window),
 		     GDK_CURRENT_TIME);
 	    }
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index ede472ab6..24f169a2b 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -757,10 +757,10 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell)
       if (menu_shell->have_xgrab)
 	{
 	  menu_shell->have_xgrab = FALSE;
-	  gdk_pointer_ungrab_for_display (
+	  gdk_display_pointer_ungrab (
 		    gdk_window_get_display(GTK_WIDGET (menu_shell)->window),
 		    GDK_CURRENT_TIME);
-	  gdk_keyboard_ungrab_for_display (
+	  gdk_display_keyboard_ungrab (
 		    gdk_window_get_display(GTK_WIDGET (menu_shell)->window),
 		    GDK_CURRENT_TIME);
 	}
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 343a89408..fe6f8b3ab 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -372,7 +372,7 @@ gtk_tips_query_real_stop_query (GtkTipsQuery *tips_query)
   gtk_grab_remove (GTK_WIDGET (tips_query));
   if (tips_query->query_cursor)
     {
-      gdk_pointer_ungrab_for_display (
+      gdk_display_pointer_ungrab (
 		     gdk_window_get_display(GTK_WIDGET (tips_query)->window),
 		     GDK_CURRENT_TIME);
       gdk_cursor_destroy (tips_query->query_cursor);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8d6f6d8e4..b266b88ab 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1416,9 +1416,9 @@ gtk_tree_view_button_release_drag_column (GtkWidget      *widget,
 
   allocation = tree_view->priv->drag_column->button->allocation;
   allocation.x = tree_view->priv->drag_column_x;
-  gdk_pointer_ungrab_for_display (GTK_WIDGET_GET_DISPLAY(widget),
+  gdk_display_pointer_ungrab (GTK_WIDGET_GET_DISPLAY(widget),
 				  GDK_CURRENT_TIME);
-  gdk_keyboard_ungrab_for_display (GTK_WIDGET_GET_DISPLAY(widget),
+  gdk_display_keyboard_ungrab (GTK_WIDGET_GET_DISPLAY(widget),
 				  GDK_CURRENT_TIME);
   gdk_window_reparent (tree_view->priv->drag_column->button->window,
 		       tree_view->priv->header_window,
@@ -1473,7 +1473,7 @@ gtk_tree_view_button_release_column_resize (GtkWidget      *widget,
   GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
   gtk_widget_get_pointer (widget, &x, NULL);
   gtk_grab_remove (widget);
-  gdk_pointer_ungrab_for_display (gdk_window_get_display(event->window), 
+  gdk_display_pointer_ungrab (gdk_window_get_display(event->window), 
 				  event->time);
 
   width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), i, &x);
@@ -5328,9 +5328,9 @@ _gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
       gdk_window_set_user_data (tree_view->priv->drag_window, GTK_WIDGET (tree_view));
     }
 
-  gdk_pointer_ungrab_for_display (gdk_window_get_display(column->button->window), 
+  gdk_display_pointer_ungrab (gdk_window_get_display(column->button->window), 
 				  GDK_CURRENT_TIME);
-  gdk_keyboard_ungrab_for_display (gdk_window_get_display(column->button->window),
+  gdk_display_keyboard_ungrab (gdk_window_get_display(column->button->window),
 				   GDK_CURRENT_TIME);
 
   gtk_grab_remove (column->button);
diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index 772ba8ef8..e642a1bd7 100644
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -364,7 +364,7 @@ gtk_vpaned_button_release (GtkWidget      *widget,
       gtk_vpaned_xor_line (paned);
       paned->in_drag = FALSE;
       paned->position_set = TRUE;
-      gdk_pointer_ungrab_for_display (gdk_window_get_display(event->window),
+      gdk_display_pointer_ungrab (gdk_window_get_display(event->window),
 				      event->time);
       gtk_widget_queue_resize (GTK_WIDGET (paned));
       g_object_freeze_notify (object);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c05e643b8..2c067ed70 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2469,7 +2469,7 @@ gtk_widget_real_mnemonic_activate (GtkWidget *widget,
     {
       g_warning ("widget `%s' isn't suitable for mnemonic activation",
 		 G_OBJECT_TYPE_NAME (widget));
-      gdk_beep_for_display (gdk_window_get_display(widget->window));
+      gdk_display_beep (gdk_window_get_display(widget->window));
     }
   return TRUE;
 }