docs: use #*-struct instead of <structname>

gdk/gdkcolor.c

@@ -47,7 +47,7 @@
  * gdk_color_copy:
  * @color: a #GdkColor
  *
- * Makes a copy of a color structure.
+ * Makes a copy of a #GdkColor.
  *
  * The result must be freed using gdk_color_free().
  *
@@ -69,7 +69,7 @@ gdk_color_copy (const GdkColor *color)
  * gdk_color_free:
  * @color: a #GdkColor
  *
- * Frees a color structure created with gdk_color_copy().
+ * Frees a #GdkColor created with gdk_color_copy().
  */
 void
 gdk_color_free (GdkColor *color)
@@ -129,8 +129,7 @@ G_DEFINE_BOXED_TYPE (GdkColor, gdk_color,
  *
  * Parses a textual specification of a color and fill in the
  * <structfield>red</structfield>, <structfield>green</structfield>,
- * and <structfield>blue</structfield> fields of a #GdkColor
- * structure.
+ * and <structfield>blue</structfield> fields of a #GdkColor.
  *
  * The string can either one of a large set of standard names
  * (taken from the X11 <filename>rgb.txt</filename> file), or

gdk/gdkcolor.h

@@ -46,7 +46,7 @@ G_BEGIN_DECLS
  * @green: The green component of the color
  * @blue: The blue component of the color
  *
- * The #GdkColor structure is used to describe a color,
+ * A #GdkColor is used to describe a color,
  * similar to the XColor struct used in the X11 drawing API.
  */
 struct _GdkColor

gdk/gdkcursor.c

@@ -54,13 +54,13 @@
  * Cursors by themselves are not very interesting, they must be be
  * bound to a window for users to see them. This is done with
  * gdk_window_set_cursor() or by setting the cursor member of the
- * #GdkWindowAttr struct passed to gdk_window_new().
+ * #GdkWindowAttr passed to gdk_window_new().
  */
 
 /**
  * GdkCursor:
  *
- * The #GdkCursor structure represents a cursor. Its contents are private.
+ * A #GdkCursor represents a cursor. Its contents are private.
  */
 
 enum {

gdk/gdkdevice.h

@@ -134,7 +134,7 @@ typedef enum {
  * @time: The timestamp for this event.
  * @axes: the values of the device's axes.
  *
- * The #GdkTimeCoord structure stores a single event in a motion history.
+ * A #GdkTimeCoord stores a single event in a motion history.
  */
 struct _GdkTimeCoord
 {

gdk/gdkevents.h

@@ -43,7 +43,7 @@ G_BEGIN_DECLS
  * @Short_description: Data structures specific to each type of event
  * @Title: Event Structures
  *
- * The event structs contain data specific to each type of event in GDK.
+ * The event structures contain data specific to each type of event in GDK.
  *
  * <note>
  * <para>
@@ -1154,10 +1154,10 @@ struct _GdkEventDND {
  * @setting: a #GdkEventSetting
  * @grab_broken: a #GdkEventGrabBroken
  *
- * The #GdkEvent struct contains a union of all of the event structs,
+ * A #GdkEvent contains a union of all of the event types,
  * and allows access to the data fields in a number of ways.
  *
- * The event type is always the first field in all of the event structs, and
+ * The event type is always the first field in all of the event types, and
  * can always be accessed with the following code, no matter what type of
  * event it is:
  * <informalexample>
@@ -1169,8 +1169,8 @@ struct _GdkEventDND {
  * </programlisting>
  * </informalexample>
  *
- * To access other fields of the event structs, the pointer to the event
- * can be cast to the appropriate event struct pointer, or the union member
+ * To access other fields of the event, the pointer to the event
+ * can be cast to the appropriate event type, or the union member
  * name can be used. For example if the event type is %GDK_BUTTON_PRESS
  * then the x coordinate of the button press can be accessed with:
  * <informalexample>

gdk/gdkrectangle.c

@@ -36,9 +36,9 @@
  * and sets of pixels on the screen. Together with Cairo's #cairo_region_t data
  * type, they make up the central types for representing graphical data.
  *
- * #GdkPoint is a simple structure containing an x and y coordinate of a point.
+ * A #GdkPoint represents an x and y coordinate of a point.
  *
- * #GdkRectangle is a structure holding the position and size of a rectangle.
+ * A #GdkRectangle represents the position and size of a rectangle.
  * The intersection of two rectangles can be computed with
  * gdk_rectangle_intersect(). To find the union of two rectangles use
  * gdk_rectangle_union().

gdk/gdkrgba.c

@@ -35,7 +35,7 @@
  * @Short_description: RGBA colors
  * @Title: RGBA Colors
  *
- * The #GdkRGBA struct is a convenient way to pass rgba colors around.
+ * #GdkRGBA is a convenient way to pass rgba colors around.
  * It's based on cairo's way to deal with colors and mirrors its behavior.
  * All values are in the range from 0.0 to 1.0 inclusive. So the color
  * (0.0, 0.0, 0.0, 0.0) represents transparent black and
@@ -54,7 +54,7 @@ G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba,
  * @alpha: The opacity of the color from 0.0 for completely translucent to
  *   1.0 for opaque
  *
- * The GdkRGBA structure is used to represent a (possibly translucent)
+ * A #GdkRGBA is used to represent a (possibly translucent)
  * color, in a way that is compatible with cairos notion of color.
  */
 
@@ -62,7 +62,7 @@ G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba,
  * gdk_rgba_copy:
  * @rgba: a #GdkRGBA
  *
- * Makes a copy of a #GdkRGBA structure.
+ * Makes a copy of a #GdkRGBA.
  *
  * The result must be freed through gdk_rgba_free().
  *
@@ -80,7 +80,7 @@ gdk_rgba_copy (const GdkRGBA *rgba)
  * gdk_rgba_free:
  * @rgba: a #GdkRGBA
  *
- * Frees a #GdkRGBA struct created with gdk_rgba_copy()
+ * Frees a #GdkRGBA created with gdk_rgba_copy()
  *
  * Since: 3.0
  */
@@ -134,13 +134,13 @@ parse_rgb_value (const gchar  *str,
 
 /**
  * gdk_rgba_parse:
- * @rgba: the #GdkRGBA struct to fill in
+ * @rgba: the #GdkRGBA to fill in
  * @spec: the string specifying the color
  *
  * Parses a textual representation of a color, filling in
  * the <structfield>red</structfield>, <structfield>green</structfield>,
  * <structfield>blue</structfield> and <structfield>alpha</structfield>
- * fields of the @rgba struct.
+ * fields of the @rgba #GdkRGBA.
  *
  * The string can be either one of:
  * <itemizedlist>

gdk/gdkvisual.h

@@ -75,7 +75,7 @@ typedef enum
 /**
  * GdkVisual:
  *
- * The #GdkVisual structure contains information about
+ * A #GdkVisual contains information about
  * a particular visual.
  */
 

gtk/deprecated/gtkrc.c

@@ -1815,7 +1815,7 @@ gtk_rc_parse_priority (GScanner	           *scanner,
 /**
  * gtk_rc_parse_color:
  * @scanner: a #GScanner
- * @color: (out): a pointer to a #GdkColor structure in which to store
+ * @color: (out): a pointer to a #GdkColor in which to store
  *     the result
  *
  * Parses a color in the format expected
@@ -1840,7 +1840,7 @@ gtk_rc_parse_color (GScanner *scanner,
  * gtk_rc_parse_color_full:
  * @scanner: a #GScanner
  * @style: (allow-none): a #GtkRcStyle, or %NULL
- * @color: (out): a pointer to a #GdkColor structure in which to store
+ * @color: (out): a pointer to a #GdkColor in which to store
  *     the result
  *
  * Parses a color in the format expected

gtk/deprecated/gtkrc.h

@@ -74,10 +74,10 @@ typedef enum
  * @xthickness: X thickness
  * @ythickness: Y thickness
  *
- * The #GtkRcStyle structure is used to represent a set
+ * The #GtkRcStyle-struct is used to represent a set
  * of information about the appearance of a widget.
  * This can later be composited together with other
- * #GtkRcStyle structures to form a #GtkStyle.
+ * #GtkRcStyle-struct<!-- -->s to form a #GtkStyle.
  */
 struct _GtkRcStyle
 {

gtk/deprecated/gtkstyle.c

@@ -4187,14 +4187,14 @@ gtk_widget_get_style (GtkWidget *widget)
 /**
  * gtk_widget_modify_style:
  * @widget: a #GtkWidget
- * @style: the #GtkRcStyle holding the style modifications
+ * @style: the #GtkRcStyle-struct holding the style modifications
  *
  * Modifies style values on the widget.
  *
  * Modifications made using this technique take precedence over
  * style values set via an RC file, however, they will be overridden
  * if a style is explicitly set on the widget using gtk_widget_set_style().
- * The #GtkRcStyle structure is designed so each field can either be
+ * The #GtkRcStyle-struct is designed so each field can either be
  * set or unset, so it is possible, using this function, to modify some
  * style values and leave the others unchanged.
  *

gtk/gtkaboutdialog.h

@@ -89,7 +89,7 @@ typedef enum {
 /**
  * GtkAboutDialog:
  *
- * The <structname>GtkAboutDialog</structname> struct contains
+ * The #GtkAboutDialog-struct contains
  * only private fields and should not be directly accessed.
  */
 struct _GtkAboutDialog

gtk/gtkaccellabel.h

@@ -53,7 +53,7 @@ typedef struct _GtkAccelLabelPrivate GtkAccelLabelPrivate;
 /**
  * GtkAccelLabel:
  *
- * The #GtkAccelLabel-struct struct contains private data only, and
+ * The #GtkAccelLabel-struct contains private data only, and
  * should be accessed using the functions below.
  */
 struct _GtkAccelLabel

gtk/gtkadjustment.h

@@ -48,7 +48,7 @@ typedef struct _GtkAdjustmentClass    GtkAdjustmentClass;
 /**
  * GtkAdjustment:
  *
- * The #GtkAdjustment struct contains only private fields and
+ * The #GtkAdjustment-struct contains only private fields and
  * should not be directly accessed.
  */
 struct _GtkAdjustment

gtk/gtkborder.c

@@ -29,9 +29,9 @@
 /**
  * gtk_border_new:
  *
- * Allocates a new #GtkBorder structure and initializes its elements to zero.
+ * Allocates a new #GtkBorder-struct and initializes its elements to zero.
  *
- * Returns: a newly allocated #GtkBorder. Free with gtk_border_free()
+ * Returns: a newly allocated #GtkBorder-struct. Free with gtk_border_free()
  *
  * Since: 2.14
  */
@@ -43,9 +43,9 @@ gtk_border_new (void)
 
 /**
  * gtk_border_copy:
- * @border_: a #GtkBorder
+ * @border_: a #GtkBorder-struct
  *
- * Copies a #GtkBorder structure.
+ * Copies a #GtkBorder-struct.
  *
  * Returns: a copy of @border_.
  */
@@ -59,9 +59,9 @@ gtk_border_copy (const GtkBorder *border_)
 
 /**
  * gtk_border_free:
- * @border_: a #GtkBorder
+ * @border_: a #GtkBorder-struct
  *
- * Frees a #GtkBorder structure.
+ * Frees a #GtkBorder-struct.
  */
 void
 gtk_border_free (GtkBorder *border_)

gtk/gtkbuildable.c

@@ -233,7 +233,7 @@ gtk_buildable_construct_child (GtkBuildable *buildable,
  * @builder: a #GtkBuilder used to construct this object
  * @child: (allow-none): child object or %NULL for non-child tags
  * @tagname: name of tag
- * @parser: (out): a #GMarkupParser structure to fill in
+ * @parser: (out): a #GMarkupParser to fill in
  * @data: (out): return location for user data that will be passed in 
  *   to parser functions
  *

gtk/gtkbuildable.h

@@ -63,7 +63,7 @@ typedef struct _GtkBuildableIface GtkBuildableIface;
  *  constructed object is returned and becomes owned by the caller.
  * @custom_tag_start: Implement this if the buildable needs to parse
  *  content below <child>. To handle an element, the implementation
- *  must fill in the @parser structure and @user_data and return %TRUE.
+ *  must fill in the @parser and @user_data and return %TRUE.
  *  #GtkWidget implements this to parse keyboard accelerators specified
  *  in <accelerator> elements. #GtkContainer implements it to map
  *  properties defined via <packing> elements to child properties.
@@ -82,9 +82,9 @@ typedef struct _GtkBuildableIface GtkBuildableIface;
  *  Implement this if the buildable has internal children that may
  *  need to be accessed from a UI definition.
  *
- * The GtkBuildableIface interface contains method that are
+ * The #GtkBuildableIface interface contains method that are
  * necessary to allow #GtkBuilder to construct an object from
- * a GtkBuilder UI definition.
+ * a #GtkBuilder UI definition.
  */
 struct _GtkBuildableIface
 {

gtk/gtkbuilder.c

@@ -1586,7 +1586,7 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
 /**
  * gtk_builder_connect_signals:
  * @builder: a #GtkBuilder
- * @user_data: a pointer to a structure sent in as user data to all signals
+ * @user_data: user data to pass back with all signals
  *
  * This method is a simpler variation of gtk_builder_connect_signals_full().
  * It uses symbols explicitly added to @builder with prior calls to

gtk/gtkdialog.c

@@ -142,7 +142,7 @@
  * is the id of widget (which should be a child of the dialogs @action_area).
  * </para>
  * <example>
- * <title>A <structname>GtkDialog</structname> UI definition fragment.</title>
+ * <title>A #GtkDialog UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="GtkDialog" id="dialog1">
  *   <child internal-child="vbox">"

gtk/gtkdialog.h

@@ -103,7 +103,7 @@ typedef struct _GtkDialogClass         GtkDialogClass;
 /**
  * GtkDialog:
  *
- * The GtkDialog struct contains only private fields
+ * The #GtkDialog-struct contains only private fields
  * and should not be directly accessed.
  */
 struct _GtkDialog

gtk/gtkfilefilter.c

@@ -537,7 +537,7 @@ gtk_file_filter_add_custom (GtkFileFilter         *filter,
  * gtk_file_filter_get_needed:
  * @filter: a #GtkFileFilter
  * 
- * Gets the fields that need to be filled in for the structure
+ * Gets the fields that need to be filled in for the #GtkFileFilterInfo
  * passed to gtk_file_filter_filter()
  * 
  * This function will not typically be used by applications; it
@@ -558,11 +558,11 @@ gtk_file_filter_get_needed (GtkFileFilter *filter)
 /**
  * gtk_file_filter_filter:
  * @filter: a #GtkFileFilter
- * @filter_info: a #GtkFileFilterInfo structure containing information
+ * @filter_info: a #GtkFileFilterInfo containing information
  *  about a file.
  * 
  * Tests whether a file should be displayed according to @filter.
- * The #GtkFileFilterInfo structure @filter_info should include
+ * The #GtkFileFilterInfo @filter_info should include
  * the fields returned from gtk_file_filter_get_needed().
  *
  * This function will not typically be used by applications; it

gtk/gtkfilefilter.h

@@ -77,7 +77,7 @@ typedef gboolean (*GtkFileFilterFunc) (const GtkFileFilterInfo *filter_info,
  *   in the file chooser
  * @mime_type: the mime type of the file
  *
- * A #GtkFileFilterInfo struct is used to pass information about the
+ * A #GtkFileFilterInfo-struct is used to pass information about the
  * tested file to gtk_file_filter_filter().
  */
 struct _GtkFileFilterInfo

gtk/gtkfilesystemmodel.c

@@ -1646,13 +1646,13 @@ _gtk_file_system_model_iter_is_filtered_out (GtkFileSystemModel *model,
  * @model: a #GtkFileSystemModel
  * @iter: a #GtkTreeIter pointing to a row of @model
  * 
- * Gets the #GFileInfo structure for a particular row
+ * Gets the #GFileInfo-struct for a particular row
  * of @model.
  * 
- * Return value: a #GFileInfo structure. This structure
+ * Return value: a #GFileInfo-struct. This value
  *   is owned by @model and must not be modified or freed.
  *   If you want to keep the information for later use,
- *   you must take a reference, since the structure may be
+ *   you must take a reference, since the #GFileInfo-struct may be
  *   freed on later changes to the file system.  If you have
  *   called _gtk_file_system_model_add_editable() and the @iter
  *   corresponds to the row that this function returned, the

gtk/gtkicontheme.c

@@ -1805,7 +1805,7 @@ choose_icon (GtkIconTheme       *icon_theme,
  * @size: desired icon size
  * @flags: flags modifying the behavior of the icon lookup
  * 
- * Looks up a named icon and returns a structure containing
+ * Looks up a named icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon. The icon
  * can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
@@ -1843,7 +1843,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme       *icon_theme,
  * @flags: flags modifying the behavior of the icon lookup
  *
  * Looks up a named icon for a particular window scale and returns a
- * structure containing information such as the filename of the
+ * #GtkIconInfo containing information such as the filename of the
  * icon. The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon() combines
  * these two steps if all you need is the pixbuf.)
@@ -1942,7 +1942,7 @@ gtk_icon_theme_lookup_icon_for_scale (GtkIconTheme       *icon_theme,
  * @size: desired icon size
  * @flags: flags modifying the behavior of the icon lookup
  * 
- * Looks up a named icon and returns a structure containing
+ * Looks up a named icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon. The icon
  * can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
@@ -1981,7 +1981,7 @@ gtk_icon_theme_choose_icon (GtkIconTheme       *icon_theme,
  * @flags: flags modifying the behavior of the icon lookup
  * 
  * Looks up a named icon for a particular window scale and returns a
- * structure containing information such as the filename of the
+ * #GtkIconInfo containing information such as the filename of the
  * icon. The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon() combines
  * these two steps if all you need is the pixbuf.)
@@ -3519,7 +3519,7 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 
 /**
  * gtk_icon_info_get_builtin_pixbuf:
- * @icon_info: a #GtkIconInfo structure
+ * @icon_info: a #GtkIconInfo
  * 
  * Gets the built-in image for this icon, if any. To allow
  * GTK+ to use built in icon images, you must pass the
@@ -3546,7 +3546,7 @@ gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info)
 
 /**
  * gtk_icon_info_is_symbolic:
- * @icon_info: a #GtkIconInfo structure
+ * @icon_info: a #GtkIconInfo
  *
  * Checks if the icon is symbolic or not. This currently uses only
  * the file name and not the file contents for determining this.
@@ -3878,7 +3878,7 @@ proxy_pixbuf_destroy (guchar *pixels, gpointer data)
 
 /**
  * gtk_icon_info_load_icon:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @error: (allow-none): location to store error information on failure,
  *     or %NULL.
  *
@@ -3952,7 +3952,7 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
 
 /**
  * gtk_icon_info_load_surface:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @for_window: (allow-none): #GdkWindow to optimize drawing for, or %NULL
  * @error: (allow-none): location to store error information on failure,
  *     or %NULL.
@@ -4012,7 +4012,7 @@ load_icon_thread  (GTask           *task,
 
 /**
  * gtk_icon_info_load_icon_async:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @cancellable: (allow-none): optional #GCancellable object,
  *     %NULL to ignore
  * @callback: (scope async): a #GAsyncReadyCallback to call when the
@@ -4060,7 +4060,7 @@ gtk_icon_info_load_icon_async (GtkIconInfo          *icon_info,
 
 /**
  * gtk_icon_info_load_icon_finish:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @res: a #GAsyncResult
  * @error: (allow-none): location to store error information on failure,
  *     or %NULL.
@@ -4526,7 +4526,7 @@ load_symbolic_icon_thread  (GTask           *task,
 
 /**
  * gtk_icon_info_load_symbolic_async:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @fg: a #GdkRGBA representing the foreground color of the icon
  * @success_color: (allow-none): a #GdkRGBA representing the warning color
  *     of the icon or %NULL to use the default color
@@ -4621,7 +4621,7 @@ gtk_icon_info_load_symbolic_async (GtkIconInfo   *icon_info,
 
 /**
  * gtk_icon_info_load_symbolic_finish:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @res: a #GAsyncResult
  * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
  *     loaded icon was a symbolic one and whether the @fg color was
@@ -4685,7 +4685,7 @@ gtk_icon_info_load_symbolic_finish (GtkIconInfo   *icon_info,
 
 /**
  * gtk_icon_info_load_symbolic_for_context_async:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @context: a #GtkStyleContext
  * @cancellable: (allow-none): optional #GCancellable object,
  *     %NULL to ignore
@@ -4750,7 +4750,7 @@ gtk_icon_info_load_symbolic_for_context_async (GtkIconInfo      *icon_info,
 
 /**
  * gtk_icon_info_load_symbolic_for_context_finish:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @res: a #GAsyncResult
  * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
  *     loaded icon was a symbolic one and whether the @fg color was
@@ -5189,12 +5189,12 @@ find_builtin_icon (const gchar *icon_name,
  * @size: desired icon size
  * @flags: flags modifying the behavior of the icon lookup
  * 
- * Looks up an icon and returns a structure containing
+ * Looks up an icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon. 
  * The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon().
  *
- * Return value: (transfer full): a #GtkIconInfo structure containing 
+ * Return value: (transfer full): a #GtkIconInfo containing 
  *     information about the icon, or %NULL if the icon 
  *     wasn't found. Unref with g_object_unref()
  *
@@ -5219,12 +5219,12 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *icon_theme,
  * @scale: the desired scale
  * @flags: flags modifying the behavior of the icon lookup
  *
- * Looks up an icon and returns a structure containing
+ * Looks up an icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon.
  * The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon().
  *
- * Return value: (transfer full): a #GtkIconInfo structure containing
+ * Return value: (transfer full): a #GtkIconInfo containing
  *     information about the icon, or %NULL if the icon
  *     wasn't found. Unref with g_object_unref()
  *

gtk/gtkimage.c

@@ -75,8 +75,7 @@
  * on the image, such as button clicks, place the image inside a
  * #GtkEventBox, then connect to the event signals on the event box.
  * <example>
- * <title>Handling button press events on a
- * <structname>GtkImage</structname>.</title>
+ * <title>Handling button press events on a #GtkImage.</title>
  * <programlisting>
  *   static gboolean
  *   button_press_callback (GtkWidget      *event_box,

gtk/gtklinkbutton.h

@@ -46,7 +46,7 @@ typedef struct _GtkLinkButtonPrivate	GtkLinkButtonPrivate;
 /**
  * GtkLinkButton:
  *
- * The <structname>GtkLinkButton</structname> structure contains only
+ * The #GtkLinkButton-struct contains only
  * private data and should be accessed using the provided API.
  */
 struct _GtkLinkButton
@@ -61,7 +61,7 @@ struct _GtkLinkButton
  * GtkLinkButtonClass:
  * @activate_link: class handler for the #GtkLinkButton::activate-link signal
  *
- * The <structname>GtkLinkButtonClass</structname> structure contains only
+ * The #GtkLinkButtonClass contains only
  * private data.
  */
 struct _GtkLinkButtonClass

gtk/gtkprintunixdialog.c

@@ -99,7 +99,7 @@
  * @notebook internal children with the name "notebook".
  *
  * <example>
- * <title>A <structname>GtkPrintUnixDialog</structname> UI definition fragment.</title>
+ * <title>A #GtkPrintUnixDialog UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="GtkPrintUnixDialog" id="dialog1">
  *   <child internal-child="notebook">

gtk/gtkrecentfilter.c

@@ -468,7 +468,7 @@ gtk_recent_filter_get_name (GtkRecentFilter *filter)
  * gtk_recent_filter_get_needed:
  * @filter: a #GtkRecentFilter
  *
- * Gets the fields that need to be filled in for the structure
+ * Gets the fields that need to be filled in for the #GtkRecentFilterInfo
  * passed to gtk_recent_filter_filter()
  * 
  * This function will not typically be used by applications; it
@@ -695,11 +695,11 @@ gtk_recent_filter_add_custom (GtkRecentFilter      *filter,
 /**
  * gtk_recent_filter_filter:
  * @filter: a #GtkRecentFilter
- * @filter_info: a #GtkRecentFilterInfo structure containing information
+ * @filter_info: a #GtkRecentFilterInfo containing information
  *   about a recently used resource
  *
  * Tests whether a file should be displayed according to @filter.
- * The #GtkRecentFilterInfo structure @filter_info should include
+ * The #GtkRecentFilterInfo @filter_info should include
  * the fields returned from gtk_recent_filter_get_needed().
  *
  * This function will not typically be used by applications; it

gtk/gtkrecentmanager.c

@@ -73,8 +73,7 @@
  * ]|
  *
  * In order to retrieve the list of recently used files, you can use
- * gtk_recent_manager_get_items(), which returns a list of #GtkRecentInfo
- * structures.
+ * gtk_recent_manager_get_items(), which returns a list of #GtkRecentInfo-struct<!-- -->s.
  *
  * A #GtkRecentManager is the model used to populate the contents of
  * one, or more #GtkRecentChooser implementations.
@@ -130,8 +129,8 @@ typedef struct
 /**
  * GtkRecentInfo:
  *
- * #GtkRecentInfo is an opaque data structure
- * whose members can only be accessed using the provided API.
+ * #GtkRecentInfo-struct contains private data only, and should
+ * be accessed using the provided API.
  *
  * #GtkRecentInfo constains all the meta-data
  * associated with an entry in the recently used files list.
@@ -858,20 +857,20 @@ gtk_recent_manager_add_item (GtkRecentManager  *manager,
  * @recent_data: metadata of the resource
  *
  * Adds a new resource, pointed by @uri, into the recently used
- * resources list, using the metadata specified inside the #GtkRecentData
- * structure passed in @recent_data.
+ * resources list, using the metadata specified inside the #GtkRecentData-struct
+ * passed in @recent_data.
  *
  * The passed URI will be used to identify this resource inside the
  * list.
  *
  * In order to register the new recently used resource, metadata about
  * the resource must be passed as well as the URI; the metadata is
- * stored in a #GtkRecentData structure, which must contain the MIME
+ * stored in a #GtkRecentData-struct, which must contain the MIME
  * type of the resource pointed by the URI; the name of the application
  * that is registering the item, and a command line to be used when
  * launching the item.
  *
- * Optionally, a #GtkRecentData structure might contain a UTF-8 string
+ * Optionally, a #GtkRecentData-struct might contain a UTF-8 string
  * to be used when viewing the item instead of the last component of the
  * URI; a short description of the item; whether the item should be
  * considered private - that is, should be displayed only by the
@@ -1147,10 +1146,10 @@ build_recent_info (GBookmarkFile  *bookmarks,
  * @error: (allow-none): a return location for a #GError, or %NULL
  *
  * Searches for a URI inside the recently used resources list, and
- * returns a structure containing informations about the resource
+ * returns a #GtkRecentInfo-struct containing informations about the resource
  * like its MIME type, or its display name.
  *
- * Return value: a #GtkRecentInfo structure containing information
+ * Return value: a #GtkRecentInfo-struct containing information
  *   about the resource pointed by @uri, or %NULL if the URI was
  *   not registered in the recently used resources list.  Free with
  *   gtk_recent_info_unref().
@@ -2090,10 +2089,10 @@ gtk_recent_info_exists (GtkRecentInfo *info)
  * @info_a: a #GtkRecentInfo
  * @info_b: a #GtkRecentInfo
  *
- * Checks whether two #GtkRecentInfo structures point to the same
+ * Checks whether two #GtkRecentInfo-struct point to the same
  * resource.
  *
- * Return value: %TRUE if both #GtkRecentInfo structures point to se same
+ * Return value: %TRUE if both #GtkRecentInfo-struct point to se same
  *   resource, %FALSE otherwise.
  *
  * Since: 2.10

gtk/gtkrecentmanager.h

@@ -83,7 +83,7 @@ struct _GtkRecentData
 /**
  * GtkRecentManager:
  *
- * #GtkRecentManager contains only private data
+ * #GtkRecentManager-struct contains only private data
  * and should be accessed using the provided API.
  *
  * Since: 2.10

gtk/gtkselection.c

@@ -68,7 +68,7 @@
  *
  * Some of the datatypes defined this section are used in
  * the #GtkClipboard and drag-and-drop API's as well. The
- * #GtkTargetEntry structure and #GtkTargetList objects represent
+ * #GtkTargetEntry and #GtkTargetList objects represent
  * lists of data types that are supported when sending or
  * receiving data. The #GtkSelectionData object is used to
  * store a chunk of data along with the data type and other
@@ -1141,7 +1141,7 @@ gtk_selection_convert (GtkWidget *widget,
 
 /**
  * gtk_selection_data_get_selection:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the selection #GdkAtom of the selection data.
  *
@@ -1159,7 +1159,7 @@ gtk_selection_data_get_selection (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_target:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the target of the selection.
  *
@@ -1177,7 +1177,7 @@ gtk_selection_data_get_target (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_data_type:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the data type of the selection.
  *
@@ -1195,7 +1195,7 @@ gtk_selection_data_get_data_type (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_format:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the format of the selection.
  *
@@ -1213,7 +1213,7 @@ gtk_selection_data_get_format (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_data: (skip)
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the raw data of the selection.
  *
@@ -1231,7 +1231,7 @@ gtk_selection_data_get_data (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_length:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the length of the raw data of the selection.
  *
@@ -1249,7 +1249,7 @@ gtk_selection_data_get_length (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_data_with_length: (rename-to gtk_selection_data_get_data)
- * @selection_data: a pointer to a #GtkSelectionData structure
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  * @length: (out): return location for length of the data segment
  *
  * Retrieves the raw data of the selection along with its length.
@@ -1271,7 +1271,7 @@ gtk_selection_data_get_data_with_length (const GtkSelectionData *selection_data,
 
 /**
  * gtk_selection_data_get_display:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the display of the selection.
  *
@@ -1289,7 +1289,7 @@ gtk_selection_data_get_display (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_set:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  * @type: the type of selection data
  * @format: format (number of bits in a unit)
  * @data: (array length=length): pointer to the data (will be copied)
@@ -3128,9 +3128,9 @@ gtk_selection_default_handler (GtkWidget	*widget,
 
 /**
  * gtk_selection_data_copy: