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.

ChangeLog

@@ -1,3 +1,12 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* 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.
+
 Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixbuf-render.c 

ChangeLog.pre-2-10

@@ -1,3 +1,12 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* 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.
+
 Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixbuf-render.c 

ChangeLog.pre-2-2

@@ -1,3 +1,12 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* 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.
+
 Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixbuf-render.c 

ChangeLog.pre-2-4

@@ -1,3 +1,12 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* 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.
+
 Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixbuf-render.c 

ChangeLog.pre-2-6

@@ -1,3 +1,12 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* 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.
+
 Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixbuf-render.c 

ChangeLog.pre-2-8

@@ -1,3 +1,12 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* 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.
+
 Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixbuf-render.c 

docs/reference/ChangeLog

@@ -1,3 +1,9 @@
+2002-08-12  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdk-sections.txt: Remove gdk_screen_close, add a section
+	for GdkDisplayManager, add gdk_visual_get_screen and
+	gdk_colormap_get_screen. 
+	
 2002-08-07  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtk-sections.txt: Remove gtk_style_get_font_for_display.

docs/reference/gdk/gdk-sections.txt

@@ -145,6 +145,26 @@ GDK_IS_DISPLAY_CLASS
 GDK_DISPLAY_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>gdkdisplaymanager</FILE>
+<TITLE>GdkDisplayManager</TITLE>
+GdkDisplayManager
+gdk_display_manager_get
+gdk_display_manager_get_default_display
+gdk_display_manager_set_default_display
+gdk_display_manager_list_displays
+gdk_display_get_core_pointer
+<SUBSECTION Standard>
+GDK_DISPLAY_MANAGER
+GDK_DISPLAY_MANAGER_CLASS
+GDK_DISPLAY_MANAGER_GET_CLASS
+GDK_IS_DISPLAY_MANAGER_CLASS
+GDK_IS_DISPLAY_MANAGER
+GDK_TYPE_DISPLAY_MANAGER
+GdkDisplayManagerClass
+gdk_display_manager_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gdkscreen</FILE>
 <TITLE>GdkScreen</TITLE>
@@ -164,7 +184,6 @@ gdk_screen_get_width
 gdk_screen_get_height
 gdk_screen_get_width_mm
 gdk_screen_get_height_mm
-gdk_screen_close
 gdk_screen_list_visuals
 gdk_screen_get_toplevel_windows
 gdk_screen_get_n_monitors
@@ -313,6 +332,7 @@ gdk_colormap_alloc_color
 gdk_colormap_free_colors
 gdk_colormap_query_color
 gdk_colormap_get_visual
+gdk_colormap_get_screen
 gdk_colors_store
 gdk_color_copy
 gdk_color_free
@@ -534,6 +554,7 @@ gdk_visual_get_best_with_type
 gdk_visual_get_best_with_both
 gdk_visual_ref
 gdk_visual_unref
+gdk_visual_get_screen
 
 <SUBSECTION Standard>
 GDK_TYPE_BYTE_ORDER

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

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.
  * 

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;
 }

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. 
+ * @width: the width of the image in pixels. 
- * @h: the height 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->width = width;
-  image->height = h;
+  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;