introspection: Fix annotations

The scanner got more strict, now some annotations need fixing.
This commit is contained in:
Florian Müllner 2010-09-15 02:56:34 +02:00
parent 1bd0ad11d8
commit 652ce3ce8c
13 changed files with 31 additions and 30 deletions

View File

@ -73,7 +73,7 @@ GdmUserManager * gdm_user_manager_ref_default (void);
GSList * gdm_user_manager_list_users (GdmUserManager *manager); GSList * gdm_user_manager_list_users (GdmUserManager *manager);
GdmUser * gdm_user_manager_get_user (GdmUserManager *manager, GdmUser * gdm_user_manager_get_user (GdmUserManager *manager,
const char *user_name); const char *username);
GdmUser * gdm_user_manager_get_user_by_uid (GdmUserManager *manager, GdmUser * gdm_user_manager_get_user_by_uid (GdmUserManager *manager,
gulong uid); gulong uid);

View File

@ -629,13 +629,14 @@ shell_app_system_create_from_window (ShellAppSystem *system, MetaWindow *window)
/** /**
* shell_app_system_lookup_heuristic_basename: * shell_app_system_lookup_heuristic_basename:
* @name: Probable application identifier * @system: a #ShellAppSystem
* @id: Probable application identifier
* *
* Find a valid application corresponding to a given * Find a valid application corresponding to a given
* heuristically determined application identifier * heuristically determined application identifier
* string, or %NULL if none. * string, or %NULL if none.
* *
* Returns: (transfer full): A #ShellApp for name * Returns: (transfer full): A #ShellApp for @name
*/ */
ShellApp * ShellApp *
shell_app_system_lookup_heuristic_basename (ShellAppSystem *system, shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
@ -902,7 +903,7 @@ shell_app_system_initial_search_internal (ShellAppSystem *self,
/** /**
* shell_app_system_initial_search: * shell_app_system_initial_search:
* @self: A #ShellAppSystem * @system: A #ShellAppSystem
* @prefs: %TRUE if we should search preferences instead of apps * @prefs: %TRUE if we should search preferences instead of apps
* @terms: (element-type utf8): List of terms, logical AND * @terms: (element-type utf8): List of terms, logical AND
* *
@ -922,7 +923,7 @@ shell_app_system_initial_search (ShellAppSystem *self,
/** /**
* shell_app_system_subsearch: * shell_app_system_subsearch:
* @self: A #ShellAppSystem * @system: A #ShellAppSystem
* @prefs: %TRUE if we should search preferences instead of apps * @prefs: %TRUE if we should search preferences instead of apps
* @previous_results: (element-type utf8): List of previous results * @previous_results: (element-type utf8): List of previous results
* @terms: (element-type utf8): List of terms, logical AND * @terms: (element-type utf8): List of terms, logical AND

View File

@ -27,9 +27,9 @@ GType shell_app_usage_get_type (void) G_GNUC_CONST;
ShellAppUsage* shell_app_usage_get_default(void); ShellAppUsage* shell_app_usage_get_default(void);
GSList *shell_app_usage_get_most_used (ShellAppUsage *monitor, GSList *shell_app_usage_get_most_used (ShellAppUsage *usage,
const char *context, const char *context,
gint number); gint max_count);
G_END_DECLS G_END_DECLS

View File

@ -37,7 +37,7 @@ G_DEFINE_TYPE(ShellDocSystem, shell_doc_system, G_TYPE_OBJECT);
/** /**
* shell_doc_system_get_all: * shell_doc_system_get_all:
* @self: A #ShellDocSystem * @system: A #ShellDocSystem
* *
* Returns the currently cached set of recent files. Recent files are read initially * Returns the currently cached set of recent files. Recent files are read initially
* from the underlying #GtkRecentManager, and updated when it changes. * from the underlying #GtkRecentManager, and updated when it changes.
@ -125,7 +125,7 @@ on_recent_file_query_result (GObject *source,
/** /**
* shell_doc_system_queue_existence_check: * shell_doc_system_queue_existence_check:
* @self: A #ShellDocSystem * @system: A #ShellDocSystem
* @n_items: Count of items to check for existence, starting from most recent * @n_items: Count of items to check for existence, starting from most recent
* *
* Asynchronously start a check of a number of recent file for existence; * Asynchronously start a check of a number of recent file for existence;

View File

@ -38,7 +38,7 @@ GtkRecentInfo *shell_doc_system_lookup_by_uri (ShellDocSystem *system,
const char *uri); const char *uri);
void shell_doc_system_queue_existence_check (ShellDocSystem *system, void shell_doc_system_queue_existence_check (ShellDocSystem *system,
guint n_recent); guint n_items);
void shell_doc_system_open (ShellDocSystem *system, void shell_doc_system_open (ShellDocSystem *system,
GtkRecentInfo *info); GtkRecentInfo *info);

View File

@ -164,7 +164,7 @@ shell_generic_container_pick (ClutterActor *actor,
/** /**
* shell_generic_container_get_n_skip_paint: * shell_generic_container_get_n_skip_paint:
* @container: A #ShellGenericContainer * @self: A #ShellGenericContainer
* *
* Returns: Number of children which will not be painted. * Returns: Number of children which will not be painted.
*/ */
@ -176,7 +176,7 @@ shell_generic_container_get_n_skip_paint (ShellGenericContainer *self)
/** /**
* shell_generic_container_get_skip_paint: * shell_generic_container_get_skip_paint:
* @container: A #ShellGenericContainer * @self: A #ShellGenericContainer
* @child: Child #ClutterActor * @child: Child #ClutterActor
* *
* Gets whether or not @actor is skipped when painting. * Gets whether or not @actor is skipped when painting.
@ -192,7 +192,7 @@ shell_generic_container_get_skip_paint (ShellGenericContainer *self,
/** /**
* shell_generic_container_set_skip_paint: * shell_generic_container_set_skip_paint:
* @container: A #ShellGenericContainer * @self: A #ShellGenericContainer
* @child: Child #ClutterActor * @child: Child #ClutterActor
* @skip: %TRUE if we should skip painting * @skip: %TRUE if we should skip painting
* *

View File

@ -44,9 +44,9 @@ GType shell_generic_container_get_type (void) G_GNUC_CONST;
guint shell_generic_container_get_n_skip_paint (ShellGenericContainer *self); guint shell_generic_container_get_n_skip_paint (ShellGenericContainer *self);
gboolean shell_generic_container_get_skip_paint (ShellGenericContainer *self, gboolean shell_generic_container_get_skip_paint (ShellGenericContainer *self,
ClutterActor *actor); ClutterActor *child);
void shell_generic_container_set_skip_paint (ShellGenericContainer *self, void shell_generic_container_set_skip_paint (ShellGenericContainer *self,
ClutterActor *actor, ClutterActor *child,
gboolean skip); gboolean skip);
#endif /* __SHELL_GENERIC_CONTAINER_H__ */ #endif /* __SHELL_GENERIC_CONTAINER_H__ */

View File

@ -95,7 +95,7 @@ st_border_image_get_borders (StBorderImage *image,
/** /**
* st_border_image_equal: * st_border_image_equal:
* @border_image: a #StBorder_Image * @image: a #StBorder_Image
* @other: a different #StBorder_Image * @other: a different #StBorder_Image
* *
* Check if two border_image objects are identical. * Check if two border_image objects are identical.

View File

@ -454,7 +454,7 @@ st_overflow_box_set_min_children (StOverflowBox *box,
/** /**
* st_overflow_box_get_n_children: * st_overflow_box_get_n_children:
* @self: a #StOverflowBox * @box: a #StOverflowBox
* *
* Returns the number of children in this box. * Returns the number of children in this box.
*/ */
@ -467,7 +467,7 @@ st_overflow_box_get_n_children (StOverflowBox *self)
/** /**
* st_overflow_box_get_n_visible: * st_overflow_box_get_n_visible:
* @self: a #StOverflowBox * @box: a #StOverflowBox
* *
* Returns the number of children we will paint. Only valid * Returns the number of children we will paint. Only valid
* after the actor has been allocated. * after the actor has been allocated.

View File

@ -75,13 +75,13 @@ void st_texture_cache_evict_recent_thumbnail (StTextureCache *cache,
GtkRecentInfo *info); GtkRecentInfo *info);
ClutterActor *st_texture_cache_load_uri_async (StTextureCache *cache, ClutterActor *st_texture_cache_load_uri_async (StTextureCache *cache,
const gchar *filename, const gchar *uri,
int available_width, int available_width,
int available_height); int available_height);
ClutterActor *st_texture_cache_load_uri_sync (StTextureCache *cache, ClutterActor *st_texture_cache_load_uri_sync (StTextureCache *cache,
StTextureCachePolicy policy, StTextureCachePolicy policy,
const gchar *filename, const gchar *uri,
int available_width, int available_width,
int available_height, int available_height,
GError **error); GError **error);

View File

@ -2669,8 +2669,8 @@ st_theme_node_adjust_for_height (StThemeNode *node,
/** /**
* st_theme_node_adjust_preferred_width: * st_theme_node_adjust_preferred_width:
* @node: a #StThemeNode * @node: a #StThemeNode
* @min_width_p: (inout) (allow-none): the width to adjust * @min_width_p: (inout) (allow-none): the minimum width to adjust
* @for_height: (inout): the height to adjust * @natural_width_p: (inout): the natural width to adjust
* *
* Adjusts the minimum and natural width computed for an actor by * Adjusts the minimum and natural width computed for an actor by
* adding on the necessary space for borders and padding and taking * adding on the necessary space for borders and padding and taking
@ -2716,7 +2716,7 @@ st_theme_node_adjust_preferred_width (StThemeNode *node,
* Adjusts a "for width" passed to clutter_actor_get_preferred_height() to * Adjusts a "for width" passed to clutter_actor_get_preferred_height() to
* account for borders and padding. This is a convenience function meant * account for borders and padding. This is a convenience function meant
* to be called from a get_preferred_height() method of a #ClutterActor * to be called from a get_preferred_height() method of a #ClutterActor
* subclass. The value after adjustmnet is the width available for the actor's * subclass. The value after adjustment is the width available for the actor's
* content. * content.
*/ */
void void
@ -2736,8 +2736,8 @@ st_theme_node_adjust_for_width (StThemeNode *node,
/** /**
* st_theme_node_adjust_preferred_height: * st_theme_node_adjust_preferred_height:
* @node: a #StThemeNode * @node: a #StThemeNode
* @min_height_p: (inout) (allow-none): the height to adjust * @min_height_p: (inout) (allow-none): the minimum height to adjust
* @for_height: (inout): the height to adjust * @natural_height_p: (inout): the natural height to adjust
* *
* Adjusts the minimum and natural height computed for an actor by * Adjusts the minimum and natural height computed for an actor by
* adding on the necessary space for borders and padding and taking * adding on the necessary space for borders and padding and taking

View File

@ -183,11 +183,11 @@ void st_theme_node_adjust_preferred_height (StThemeNode *node,
/* Helper for allocate() ClutterActor vfunc */ /* Helper for allocate() ClutterActor vfunc */
void st_theme_node_get_content_box (StThemeNode *node, void st_theme_node_get_content_box (StThemeNode *node,
const ClutterActorBox *actor_box, const ClutterActorBox *allocation,
ClutterActorBox *content_box); ClutterActorBox *content_box);
/* Helper for StThemeNodeTransition */ /* Helper for StThemeNodeTransition */
void st_theme_node_get_paint_box (StThemeNode *node, void st_theme_node_get_paint_box (StThemeNode *node,
const ClutterActorBox *actor_box, const ClutterActorBox *allocation,
ClutterActorBox *paint_box); ClutterActorBox *paint_box);
gboolean st_theme_node_geometry_equal (StThemeNode *node, gboolean st_theme_node_geometry_equal (StThemeNode *node,

View File

@ -1144,7 +1144,7 @@ st_widget_remove_style_pseudo_class (StWidget *actor,
/** /**
* st_widget_set_style: * st_widget_set_style:
* @actor: a #StWidget * @actor: a #StWidget
* @style_class: (allow-none): a inline style string, or %NULL * @style: (allow-none): a inline style string, or %NULL
* *
* Set the inline style string for this widget. The inline style string is an * Set the inline style string for this widget. The inline style string is an
* optional ';'-separated list of CSS properties that override the style as * optional ';'-separated list of CSS properties that override the style as