diff options
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.c | 6 | ||||
| -rw-r--r-- | gdk/gdkapplaunchcontext.c | 4 | ||||
| -rw-r--r-- | gdk/gdkdisplay.c | 6 | ||||
| -rw-r--r-- | gdk/gdkdraw.c | 12 | ||||
| -rw-r--r-- | gdk/gdkpango.c | 14 | ||||
| -rw-r--r-- | gdk/gdkpixbuf-drawable.c | 6 | ||||
| -rw-r--r-- | gdk/gdkrectangle.c | 2 | ||||
| -rw-r--r-- | gdk/gdkscreen.c | 2 | ||||
| -rw-r--r-- | gdk/gdkselection.c | 2 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 8 |
10 files changed, 31 insertions, 31 deletions
@@ -534,7 +534,7 @@ gdk_threads_dispatch_free (gpointer data) * range btweeen #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE * @function: function to call * @data: data to pass to @function - * @notify: function to call when the idle is removed, or %NULL + * @notify: (allow-none): function to call when the idle is removed, or %NULL * * Adds a function to be called whenever there are no higher priority * events pending. If the function returns %FALSE it is automatically @@ -634,7 +634,7 @@ gdk_threads_add_idle (GSourceFunc function, * (1/1000ths of a second) * @function: function to call * @data: data to pass to @function - * @notify: function to call when the timeout is removed, or %NULL + * @notify: (allow-none): function to call when the timeout is removed, or %NULL * * Sets a function to be called at regular intervals holding the GDK lock, * with the given priority. The function is called repeatedly until it @@ -740,7 +740,7 @@ gdk_threads_add_timeout (guint interval, * @interval: the time between calls to the function, in seconds * @function: function to call * @data: data to pass to @function - * @notify: function to call when the timeout is removed, or %NULL + * @notify: (allow-none): function to call when the timeout is removed, or %NULL * * A variant of gdk_threads_add_timout_full() with second-granularity. * See g_timeout_add_seconds_full() for a discussion of why it is diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c index 7c19770c79..1653e97527 100644 --- a/gdk/gdkapplaunchcontext.c +++ b/gdk/gdkapplaunchcontext.c @@ -218,7 +218,7 @@ gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context, /** * gdk_app_launch_context_set_icon: * @context: a #GdkAppLaunchContext - * @icon: a #GIcon, or %NULL + * @icon: (allow-none): a #GIcon, or %NULL * * Sets the icon for applications that are launched with this * context. @@ -250,7 +250,7 @@ gdk_app_launch_context_set_icon (GdkAppLaunchContext *context, /** * gdk_app_launch_context_set_icon_name: * @context: a #GdkAppLaunchContext - * @icon_name: an icon name, or %NULL + * @icon_name: (allow-none): an icon name, or %NULL * * Sets the icon for applications that are launched with this context. * The @icon_name will be interpreted in the same way as the Icon field diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 34c8035418..ac49a5bf49 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -468,9 +468,9 @@ _gdk_display_enable_motion_hints (GdkDisplay *display) * @display: a #GdkDisplay * @screen: (allow-none): location to store the screen that the * cursor is on, or %NULL. - * @x: (out): location to store root window X coordinate of pointer, or %NULL. - * @y: (out): location to store root window Y coordinate of pointer, or %NULL. - * @mask: (out): location to store current modifier mask, or %NULL + * @x: (allow-none): (out): location to store root window X coordinate of pointer, or %NULL. + * @y: (allow-none): (out): location to store root window Y coordinate of pointer, or %NULL. + * @mask: (allow-none): (out): location to store current modifier mask, or %NULL * * Gets the current location of the pointer and the current modifier * mask for a given display. diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index ef42b8e5f8..0e6ccc573e 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -99,7 +99,7 @@ gdk_drawable_init (GdkDrawable *drawable) * @drawable: a #GdkDrawable * @key: name to store the data under * @data: arbitrary data - * @destroy_func: function to free @data, or %NULL + * @destroy_func: (allow-none): function to free @data, or %NULL * * This function is equivalent to g_object_set_data(), * the #GObject variant should be used instead. @@ -142,8 +142,8 @@ gdk_drawable_get_data (GdkDrawable *drawable, /** * gdk_drawable_get_size: * @drawable: a #GdkDrawable - * @width: (out): location to store drawable's width, or %NULL - * @height: (out): location to store drawable's height, or %NULL + * @width: (allow-none): (out): location to store drawable's width, or %NULL + * @height: (allow-none): (out): location to store drawable's height, or %NULL * * Fills *@width and *@height with the size of @drawable. * @width or @height can be %NULL if you only want the other one. @@ -733,7 +733,7 @@ gdk_draw_image (GdkDrawable *drawable, /** * gdk_draw_pixbuf: * @drawable: Destination drawable. - * @gc: a #GdkGC, used for clipping, or %NULL + * @gc: (allow-none): a #GdkGC, used for clipping, or %NULL * @pixbuf: a #GdkPixbuf * @src_x: Source X coordinate within pixbuf. * @src_y: Source Y coordinates within pixbuf. @@ -955,7 +955,7 @@ gdk_draw_glyphs (GdkDrawable *drawable, * gdk_draw_glyphs_transformed: * @drawable: a #GdkDrawable * @gc: a #GdkGC - * @matrix: a #PangoMatrix, or %NULL to use an identity transformation + * @matrix: (allow-none): a #PangoMatrix, or %NULL to use an identity transformation * @font: the font in which to draw the string * @x: the x position of the start of the string (in Pango * units in user space coordinates) @@ -1038,7 +1038,7 @@ gdk_draw_trapezoids (GdkDrawable *drawable, /** * gdk_drawable_copy_to_image: * @drawable: a #GdkDrawable - * @image: a #GdkDrawable, or %NULL if a new @image should be created. + * @image: (allow-none): a #GdkDrawable, or %NULL if a new @image should be created. * @src_x: x coordinate on @drawable * @src_y: y coordinate on @drawable * @dest_x: x coordinate within @image. Must be 0 if @image is %NULL diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 24efca8b29..825b238b79 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -623,7 +623,7 @@ gdk_pango_renderer_get_default (GdkScreen *screen) /** * gdk_pango_renderer_set_drawable: * @gdk_renderer: a #GdkPangoRenderer - * @drawable: the new target drawable, or %NULL + * @drawable: (allow-none): the new target drawable, or %NULL * * Sets the drawable the renderer draws to. * @@ -653,7 +653,7 @@ gdk_pango_renderer_set_drawable (GdkPangoRenderer *gdk_renderer, /** * gdk_pango_renderer_set_gc: * @gdk_renderer: a #GdkPangoRenderer - * @gc: the new GC to use for drawing, or %NULL + * @gc: (allow-none): the new GC to use for drawing, or %NULL * * Sets the GC the renderer draws with. Note that the GC must not be * modified until it is unset by calling the function again with @@ -730,7 +730,7 @@ gdk_pango_renderer_set_stipple (GdkPangoRenderer *gdk_renderer, * gdk_pango_renderer_set_override_color: * @gdk_renderer: a #GdkPangoRenderer * @part: the part to render to set the color of - * @color: the color to use, or %NULL to unset a previously + * @color: (allow-none): the color to use, or %NULL to unset a previously * set override color. * * Sets the color for a particular render part (foreground, @@ -851,8 +851,8 @@ release_renderer (PangoRenderer *renderer) * @x: the x position of start of string (in pixels) * @y: the y position of baseline (in pixels) * @line: a #PangoLayoutLine - * @foreground: foreground override color, or %NULL for none - * @background: background override color, or %NULL for none + * @foreground: (allow-none): foreground override color, or %NULL for none + * @background: (allow-none): background override color, or %NULL for none * * Render a #PangoLayoutLine onto a #GdkDrawable, overriding the * layout's normal colors with @foreground and/or @background. @@ -928,8 +928,8 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable, * @x: the X position of the left of the layout (in pixels) * @y: the Y position of the top of the layout (in pixels) * @layout: a #PangoLayout - * @foreground: foreground override color, or %NULL for none - * @background: background override color, or %NULL for none + * @foreground: (allow-none): foreground override color, or %NULL for none + * @background: (allow-none): background override color, or %NULL for none * * Render a #PangoLayout onto a #GdkDrawable, overriding the * layout's normal colors with @foreground and/or @background. diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index 98c399be04..036ff521d3 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -1135,7 +1135,7 @@ rgbconvert (GdkImage *image, /** * gdk_pixbuf_get_from_drawable: - * @dest: Destination pixbuf, or %NULL if a new pixbuf should be created. + * @dest: (allow-none): Destination pixbuf, or %NULL if a new pixbuf should be created. * @src: Source drawable. * @cmap: A colormap if @src doesn't have one set. * @src_x: Source X coordinate within drawable. @@ -1312,9 +1312,9 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest, /** * gdk_pixbuf_get_from_image: - * @dest: Destination pixbuf, or %NULL if a new pixbuf should be created. + * @dest: (allow-none): Destination pixbuf, or %NULL if a new pixbuf should be created. * @src: Source #GdkImage. - * @cmap: A colormap, or %NULL to use the one for @src + * @cmap: (allow-none): A colormap, or %NULL to use the one for @src * @src_x: Source X coordinate within drawable. * @src_y: Source Y coordinate within drawable. * @dest_x: Destination X coordinate in pixbuf, or 0 if @dest is NULL. diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index 1f06f7daf6..9ad5509ef0 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -62,7 +62,7 @@ gdk_rectangle_union (const GdkRectangle *src1, * gdk_rectangle_intersect: * @src1: a #GdkRectangle * @src2: a #GdkRectangle - * @dest: return location for the intersection of @src1 and @src2, or %NULL + * @dest: (allow-none): return location for the intersection of @src1 and @src2, or %NULL * * Calculates the intersection of two rectangles. It is allowed for * @dest to be the same as either @src1 or @src2. If the rectangles diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index cd1dc6c815..4a6e11b657 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -397,7 +397,7 @@ gdk_screen_height_mm (void) /** * gdk_screen_set_font_options: * @screen: a #GdkScreen - * @options: a #cairo_font_options_t, or %NULL to unset any + * @options: (allow-none): a #cairo_font_options_t, or %NULL to unset any * previously set default font options. * * Sets the default font options for the screen. These diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c index 2a9b84c6a4..fd8f705811 100644 --- a/gdk/gdkselection.c +++ b/gdk/gdkselection.c @@ -77,7 +77,7 @@ gdk_text_property_to_text_list (GdkAtom encoding, * @format: the format of the property * @text: the text to convert * @length: the length of @text, in bytes - * @list: location to store the list of strings or %NULL. The + * @list: (allow-none): location to store the list of strings or %NULL. The * list should be freed with g_strfreev(). * * Convert a text property in the giving encoding to diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 046dae9275..5c9219d583 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -5573,7 +5573,7 @@ gdk_window_invalidate_rect_full (GdkWindow *window, /** * gdk_window_invalidate_rect: * @window: a #GdkWindow - * @rect: rectangle to invalidate or %NULL to invalidate the whole + * @rect: (allow-none): rectangle to invalidate or %NULL to invalidate the whole * window * @invalidate_children: whether to also invalidate child windows * @@ -6777,7 +6777,7 @@ gdk_window_lower (GdkWindow *window) /** * gdk_window_restack: * @window: a #GdkWindow - * @sibling: a #GdkWindow that is a sibling of @window, or %NULL + * @sibling: (allow-none): a #GdkWindow that is a sibling of @window, or %NULL * @above: a boolean * * Changes the position of @window in the Z-order (stacking order), so that @@ -7761,7 +7761,7 @@ gdk_window_set_background (GdkWindow *window, /** * gdk_window_set_back_pixmap: * @window: a #GdkWindow - * @pixmap: a #GdkPixmap, or %NULL + * @pixmap: (allow-none): a #GdkPixmap, or %NULL * @parent_relative: whether the tiling origin is at the origin of * @window's parent * @@ -8331,7 +8331,7 @@ gdk_window_merge_child_shapes (GdkWindow *window) /** * gdk_window_input_shape_combine_mask: * @window: a #GdkWindow - * @mask: shape mask, or %NULL + * @mask: (allow-none): shape mask, or %NULL * @x: X position of shape mask with respect to @window * @y: Y position of shape mask with respect to @window * |