Update (allow-none) annotations

The annotation has been deprecated in favor of (nullable) and/or
(optional).
This commit is contained in:
Florian Müllner 2014-05-28 21:44:23 +02:00
parent 1fe5b3e7d5
commit d380d30ef4
8 changed files with 15 additions and 15 deletions

View File

@ -210,9 +210,9 @@ make_watch (MetaIdleMonitor *monitor,
* meta_idle_monitor_add_idle_watch:
* @monitor: A #MetaIdleMonitor
* @interval_msec: The idletime interval, in milliseconds
* @callback: (allow-none): The callback to call when the user has
* @callback: (nullable): The callback to call when the user has
* accumulated @interval_msec milliseconds of idle time.
* @user_data: (allow-none): The user data to pass to the callback
* @user_data: (nullable): The user data to pass to the callback
* @notify: A #GDestroyNotify
*
* Returns: a watch id
@ -252,9 +252,9 @@ meta_idle_monitor_add_idle_watch (MetaIdleMonitor *monitor,
/**
* meta_idle_monitor_add_user_active_watch:
* @monitor: A #MetaIdleMonitor
* @callback: (allow-none): The callback to call when the user is
* @callback: (nullable): The callback to call when the user is
* active again.
* @user_data: (allow-none): The user data to pass to the callback
* @user_data: (nullable): The user data to pass to the callback
* @notify: A #GDestroyNotify
*
* Returns: a watch id

View File

@ -68,7 +68,7 @@ meta_create_color_texture_4ub (guint8 red,
/**
* meta_create_texture_pipeline:
* @src_texture: (allow-none): texture to use initially for the layer
* @src_texture: (nullable): texture to use initially for the layer
*
* Creates a pipeline with a single layer. Using a common template
* makes it easier for Cogl to share a shader for different uses in

View File

@ -595,7 +595,7 @@ meta_compositor_unmanage (MetaCompositor *compositor)
/**
* meta_shape_cow_for_window:
* @compositor: A #MetaCompositor
* @window: (allow-none): A #MetaWindow to shape the COW for
* @window: (nullable): A #MetaWindow to shape the COW for
*
* Sets an bounding shape on the COW so that the given window
* is exposed. If @window is %NULL it clears the shape again.

View File

@ -189,7 +189,7 @@ meta_shadow_unref (MetaShadow *shadow)
* @window_y: y position of the region to paint a shadow for
* @window_width: actual width of the region to paint a shadow for
* @window_height: actual height of the region to paint a shadow for
* @clip: (allow-none): if non-%NULL specifies the visible portion
* @clip: (nullable): if non-%NULL specifies the visible portion
* of the shadow.
* @clip_strictly: if %TRUE, drawing will be clipped strictly
* to @clip, otherwise, it will be only used to optimize

View File

@ -2526,7 +2526,7 @@ mru_cmp (gconstpointer a,
* @display: a #MetaDisplay
* @type: type of tab list
* @screen: a #MetaScreen
* @workspace: (allow-none): origin workspace
* @workspace: (nullable): origin workspace
*
* Determine the list of windows that should be displayed for Alt-TAB
* functionality. The windows are returned in most recently used order.
@ -2595,7 +2595,7 @@ meta_display_get_tab_list (MetaDisplay *display,
* @display: a #MetaDisplay
* @type: type of tab list
* @workspace: origin workspace
* @window: (allow-none): starting window
* @window: (nullable): starting window
* @backward: If %TRUE, look for the previous window.
*
* Determine the next window that should be displayed for Alt-TAB

View File

@ -3187,7 +3187,7 @@ handle_switch_vt (MetaDisplay *display,
/**
* meta_keybindings_set_custom_handler:
* @name: The name of the keybinding to set
* @handler: (allow-none): The new handler function
* @handler: (nullable): The new handler function
* @user_data: User data to pass to the callback
* @free_data: Will be called when this handler is overridden.
*

View File

@ -180,7 +180,7 @@ typedef struct
/**
* MetaStringPreference:
* @handler: (allow-none): A handler. Many of the string preferences
* @handler: (nullable): A handler. Many of the string preferences
* aren't stored as strings and need parsing; others of them have
* default values which can't be solved in the general case. If you
* include a function pointer here, it will be called instead of writing
@ -192,7 +192,7 @@ typedef struct
* in particular the @result (out) parameter as returned by
* g_settings_get_mapped() will be ignored in all cases.
* This may be %NULL. If it is, see "target", below.
* @target: (allow-none): Where to write the incoming string.
* @target: (nullable): Where to write the incoming string.
* This must be %NULL if the handler is non-%NULL.
* If the incoming string is %NULL, no change will be made.
*/

View File

@ -4789,7 +4789,7 @@ meta_window_get_icon_geometry (MetaWindow *window,
/**
* meta_window_set_icon_geometry:
* @window: a #MetaWindow
* @rect: (allow-none): rectangle with the desired geometry or %NULL.
* @rect: (nullable): rectangle with the desired geometry or %NULL.
*
* Sets or unsets the location of the icon corresponding to the window. If
* set, the location should correspond to a dock, task bar or other user
@ -7280,7 +7280,7 @@ meta_window_get_frame_type (MetaWindow *window)
*
* Gets a region representing the outer bounds of the window's frame.
*
* Return value: (transfer none) (allow-none): a #cairo_region_t
* Return value: (transfer none) (nullable): a #cairo_region_t
* holding the outer bounds of the window, or %NULL if the window
* doesn't have a frame.
*/
@ -7325,7 +7325,7 @@ meta_window_is_attached_dialog (MetaWindow *window)
* - there is no 3rd window stacked between both tiled windows that's
* partially visible in the common edge.
*
* Return value: (transfer none) (allow-none): the matching tiled window or
* Return value: (transfer none) (nullable): the matching tiled window or
* %NULL if it doesn't exist.
*/
MetaWindow *