From 652ce3ce8cf902fd811bcc5fca09563765c299f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 15 Sep 2010 02:56:34 +0200 Subject: [PATCH] introspection: Fix annotations The scanner got more strict, now some annotations need fixing. --- src/gdmuser/gdm-user-manager.h | 2 +- src/shell-app-system.c | 9 +++++---- src/shell-app-usage.h | 6 +++--- src/shell-doc-system.c | 4 ++-- src/shell-doc-system.h | 2 +- src/shell-generic-container.c | 6 +++--- src/shell-generic-container.h | 4 ++-- src/st/st-border-image.c | 2 +- src/st/st-overflow-box.c | 4 ++-- src/st/st-texture-cache.h | 4 ++-- src/st/st-theme-node.c | 10 +++++----- src/st/st-theme-node.h | 4 ++-- src/st/st-widget.c | 4 ++-- 13 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/gdmuser/gdm-user-manager.h b/src/gdmuser/gdm-user-manager.h index bb1118090..f57b4cd1f 100644 --- a/src/gdmuser/gdm-user-manager.h +++ b/src/gdmuser/gdm-user-manager.h @@ -73,7 +73,7 @@ GdmUserManager * gdm_user_manager_ref_default (void); GSList * gdm_user_manager_list_users (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, gulong uid); diff --git a/src/shell-app-system.c b/src/shell-app-system.c index 0afe1b18d..10355a8c5 100644 --- a/src/shell-app-system.c +++ b/src/shell-app-system.c @@ -629,13 +629,14 @@ shell_app_system_create_from_window (ShellAppSystem *system, MetaWindow *window) /** * 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 * heuristically determined application identifier * string, or %NULL if none. * - * Returns: (transfer full): A #ShellApp for name + * Returns: (transfer full): A #ShellApp for @name */ ShellApp * 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: - * @self: A #ShellAppSystem + * @system: A #ShellAppSystem * @prefs: %TRUE if we should search preferences instead of apps * @terms: (element-type utf8): List of terms, logical AND * @@ -922,7 +923,7 @@ shell_app_system_initial_search (ShellAppSystem *self, /** * shell_app_system_subsearch: - * @self: A #ShellAppSystem + * @system: A #ShellAppSystem * @prefs: %TRUE if we should search preferences instead of apps * @previous_results: (element-type utf8): List of previous results * @terms: (element-type utf8): List of terms, logical AND diff --git a/src/shell-app-usage.h b/src/shell-app-usage.h index f136bdef8..1070077cf 100644 --- a/src/shell-app-usage.h +++ b/src/shell-app-usage.h @@ -27,9 +27,9 @@ GType shell_app_usage_get_type (void) G_GNUC_CONST; ShellAppUsage* shell_app_usage_get_default(void); -GSList *shell_app_usage_get_most_used (ShellAppUsage *monitor, - const char *context, - gint number); +GSList *shell_app_usage_get_most_used (ShellAppUsage *usage, + const char *context, + gint max_count); G_END_DECLS diff --git a/src/shell-doc-system.c b/src/shell-doc-system.c index ee2eb99c2..dab64e9a0 100644 --- a/src/shell-doc-system.c +++ b/src/shell-doc-system.c @@ -37,7 +37,7 @@ G_DEFINE_TYPE(ShellDocSystem, shell_doc_system, G_TYPE_OBJECT); /** * shell_doc_system_get_all: - * @self: A #ShellDocSystem + * @system: A #ShellDocSystem * * Returns the currently cached set of recent files. Recent files are read initially * 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: - * @self: A #ShellDocSystem + * @system: A #ShellDocSystem * @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; diff --git a/src/shell-doc-system.h b/src/shell-doc-system.h index 0f2ad6037..95ffb6c2f 100644 --- a/src/shell-doc-system.h +++ b/src/shell-doc-system.h @@ -38,7 +38,7 @@ GtkRecentInfo *shell_doc_system_lookup_by_uri (ShellDocSystem *system, const char *uri); void shell_doc_system_queue_existence_check (ShellDocSystem *system, - guint n_recent); + guint n_items); void shell_doc_system_open (ShellDocSystem *system, GtkRecentInfo *info); diff --git a/src/shell-generic-container.c b/src/shell-generic-container.c index a1773117c..5b439636c 100644 --- a/src/shell-generic-container.c +++ b/src/shell-generic-container.c @@ -164,7 +164,7 @@ shell_generic_container_pick (ClutterActor *actor, /** * shell_generic_container_get_n_skip_paint: - * @container: A #ShellGenericContainer + * @self: A #ShellGenericContainer * * 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: - * @container: A #ShellGenericContainer + * @self: A #ShellGenericContainer * @child: Child #ClutterActor * * 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: - * @container: A #ShellGenericContainer + * @self: A #ShellGenericContainer * @child: Child #ClutterActor * @skip: %TRUE if we should skip painting * diff --git a/src/shell-generic-container.h b/src/shell-generic-container.h index 16170eca8..f49b78a85 100644 --- a/src/shell-generic-container.h +++ b/src/shell-generic-container.h @@ -44,9 +44,9 @@ GType shell_generic_container_get_type (void) G_GNUC_CONST; guint shell_generic_container_get_n_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, - ClutterActor *actor, + ClutterActor *child, gboolean skip); #endif /* __SHELL_GENERIC_CONTAINER_H__ */ diff --git a/src/st/st-border-image.c b/src/st/st-border-image.c index 4e27d6ebe..1a67a9542 100644 --- a/src/st/st-border-image.c +++ b/src/st/st-border-image.c @@ -95,7 +95,7 @@ st_border_image_get_borders (StBorderImage *image, /** * st_border_image_equal: - * @border_image: a #StBorder_Image + * @image: a #StBorder_Image * @other: a different #StBorder_Image * * Check if two border_image objects are identical. diff --git a/src/st/st-overflow-box.c b/src/st/st-overflow-box.c index 9743955ea..686b7473a 100644 --- a/src/st/st-overflow-box.c +++ b/src/st/st-overflow-box.c @@ -454,7 +454,7 @@ st_overflow_box_set_min_children (StOverflowBox *box, /** * st_overflow_box_get_n_children: - * @self: a #StOverflowBox + * @box: a #StOverflowBox * * 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: - * @self: a #StOverflowBox + * @box: a #StOverflowBox * * Returns the number of children we will paint. Only valid * after the actor has been allocated. diff --git a/src/st/st-texture-cache.h b/src/st/st-texture-cache.h index 861641ded..79cf0b6dd 100644 --- a/src/st/st-texture-cache.h +++ b/src/st/st-texture-cache.h @@ -75,13 +75,13 @@ void st_texture_cache_evict_recent_thumbnail (StTextureCache *cache, GtkRecentInfo *info); ClutterActor *st_texture_cache_load_uri_async (StTextureCache *cache, - const gchar *filename, + const gchar *uri, int available_width, int available_height); ClutterActor *st_texture_cache_load_uri_sync (StTextureCache *cache, StTextureCachePolicy policy, - const gchar *filename, + const gchar *uri, int available_width, int available_height, GError **error); diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c index 7882de3dd..b70912031 100644 --- a/src/st/st-theme-node.c +++ b/src/st/st-theme-node.c @@ -2669,8 +2669,8 @@ st_theme_node_adjust_for_height (StThemeNode *node, /** * st_theme_node_adjust_preferred_width: * @node: a #StThemeNode - * @min_width_p: (inout) (allow-none): the width to adjust - * @for_height: (inout): the height to adjust + * @min_width_p: (inout) (allow-none): the minimum width to adjust + * @natural_width_p: (inout): the natural width to adjust * * Adjusts the minimum and natural width computed for an actor by * 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 * account for borders and padding. This is a convenience function meant * 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. */ void @@ -2736,8 +2736,8 @@ st_theme_node_adjust_for_width (StThemeNode *node, /** * st_theme_node_adjust_preferred_height: * @node: a #StThemeNode - * @min_height_p: (inout) (allow-none): the height to adjust - * @for_height: (inout): the height to adjust + * @min_height_p: (inout) (allow-none): the minimum height to adjust + * @natural_height_p: (inout): the natural height to adjust * * Adjusts the minimum and natural height computed for an actor by * adding on the necessary space for borders and padding and taking diff --git a/src/st/st-theme-node.h b/src/st/st-theme-node.h index 43f806ecb..0b0a4fd5b 100644 --- a/src/st/st-theme-node.h +++ b/src/st/st-theme-node.h @@ -183,11 +183,11 @@ void st_theme_node_adjust_preferred_height (StThemeNode *node, /* Helper for allocate() ClutterActor vfunc */ void st_theme_node_get_content_box (StThemeNode *node, - const ClutterActorBox *actor_box, + const ClutterActorBox *allocation, ClutterActorBox *content_box); /* Helper for StThemeNodeTransition */ void st_theme_node_get_paint_box (StThemeNode *node, - const ClutterActorBox *actor_box, + const ClutterActorBox *allocation, ClutterActorBox *paint_box); gboolean st_theme_node_geometry_equal (StThemeNode *node, diff --git a/src/st/st-widget.c b/src/st/st-widget.c index f56331d21..e5f30509f 100644 --- a/src/st/st-widget.c +++ b/src/st/st-widget.c @@ -1144,7 +1144,7 @@ st_widget_remove_style_pseudo_class (StWidget *actor, /** * st_widget_set_style: * @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 * optional ';'-separated list of CSS properties that override the style as @@ -1152,7 +1152,7 @@ st_widget_remove_style_pseudo_class (StWidget *actor, */ void st_widget_set_style (StWidget *actor, - const gchar *style) + const gchar *style) { StWidgetPrivate *priv = actor->priv;