Remove gdk_screen_close, add a section for GdkDisplayManager, add

	* gdk/gdk-sections.txt: Remove gdk_screen_close, add a section
	for GdkDisplayManager, add gdk_visual_get_screen and
	gdk_colormap_get_screen.
	* gdk/gdkdisplaymanager.c:
	* gdk/gdkdisplay.c (gdk_pointer_ungrab): Fix doc comments.

	* gdk/x11/gdkcolor-x11.c (gdk_colormap_get_screen):
	* gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Make parameter
	names match those in the header file, to silence gtk-doc.

4 files changed, 14 insertions, 11 deletions

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 47cb674f6b..dfaae31ad7 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -218,6 +218,7 @@ gdk_display_put_event (GdkDisplay *display,
  * gdk_pointer_ungrab:
  * @time: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is
  *        available.
+ *
  * Ungrabs the pointer, if it is grabbed by this application.
  **/
 void
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 31b8701728..e3ac84162f 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -174,6 +174,7 @@ gdk_display_manager_get (void)
 
 /**
  * gdk_display_manager_get_default_display:
+ * @display_manager: a #GdkDisplayManager 
  *
  * Gets the default #GdkDisplay. This is a convenience
  * function for:
@@ -227,6 +228,7 @@ gdk_screen_get_default (void)
 
 /**
  * gdk_display_manager_set_default_display:
+ * @display_manager: a #GdkDisplayManager
  * @display: a #GdkDisplay
  * 
  * Sets @display as the default display.
@@ -244,6 +246,7 @@ gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
 
 /**
  * gdk_display_manager_list_displays:
+ * @display_manager: a #GdkDisplayManager 
  *
  * List all currently open displays.
  * 
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 40be6ef6c0..54f07681ab 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -1026,7 +1026,6 @@ gdk_colormap_alloc_colors (GdkColormap *colormap,
 	  success[i] = TRUE;
 	}
       break;
-
     case GDK_VISUAL_STATIC_GRAY:
     case GDK_VISUAL_STATIC_COLOR:
       for (i=0; i<ncolors; i++)
@@ -1318,16 +1317,16 @@ gdk_x11_colormap_get_xcolormap (GdkColormap *colormap)
 
 /**
  * gdk_colormap_get_screen:
- * @colormap: a #GdkColormap
+ * @cmap: a #GdkColormap
  * 
  * Gets the screen for which this colormap was created.
  * 
  * Return value: the screen for which this colormap was created.
  **/
 GdkScreen *
-gdk_colormap_get_screen (GdkColormap *colormap)
+gdk_colormap_get_screen (GdkColormap *cmap)
 {
-  g_return_val_if_fail (GDK_IS_COLORMAP (colormap), NULL);
+  g_return_val_if_fail (GDK_IS_COLORMAP (cmap), NULL);
 
-  return  GDK_COLORMAP_PRIVATE_DATA (colormap)->screen;
+  return  GDK_COLORMAP_PRIVATE_DATA (cmap)->screen;
 }
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 6bbff5fc30..95beb66259 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -146,8 +146,8 @@ _gdk_image_exit (void)
  * gdk_image_new_bitmap:
  * @visual: the #GdkVisual to use for the image.
  * @data: the pixel data. 
- * @w: the width of the image in pixels. 
- * @h: the height of the image in pixels. 
+ * @width: the width of the image in pixels. 
+ * @height: the height of the image in pixels. 
  * 
  * Creates a new #GdkImage with a depth of 1 from the given data.
  * <warning><para>THIS FUNCTION IS INCREDIBLY BROKEN. The passed-in data must 
@@ -157,7 +157,7 @@ _gdk_image_exit (void)
  * Return value: a new #GdkImage.
  **/
 GdkImage *
-gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
+gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint width, gint height)
 {
   Visual *xvisual;
   GdkImage *image;
@@ -171,8 +171,8 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
   
   image->type = GDK_IMAGE_NORMAL;
   image->visual = visual;
-  image->width = w;
-  image->height = h;
+  image->width = width;
+  image->height = height;
   image->depth = 1;
   image->bits_per_pixel = 1;
   if (display->closed)
@@ -182,7 +182,7 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
       xvisual = ((GdkVisualPrivate*) visual)->xvisual;
       private->ximage = XCreateImage (GDK_SCREEN_XDISPLAY (private->screen),
 				      xvisual, 1, XYBitmap,
-				      0, 0, w ,h, 8, 0);
+				      0, 0, width, height, 8, 0);
     }
   
   private->ximage->data = data;