2006-06-22 Ross Burton <ross@openedhand.com>

	* clutter/clutter-label.c:
	* clutter/clutter-video-texture.c:
	* clutter/clutter-texture.c:
	* clutter/clutter-timeline.c:
	Fix gtk-doc problems.

diff --git a/ChangeLog b/ChangeLog
index 6a53835..1d3ba39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-22  Ross Burton  <ross@openedhand.com>
+
+       * clutter/clutter-label.c:
+       * clutter/clutter-video-texture.c:
+       * clutter/clutter-texture.c:
+       * clutter/clutter-timeline.c:
+       Fix gtk-doc problems.
+
 2006-06-22  Iain Holmes  <iain@openedhand.com>
 
        * clutter/clutter-main.c: More documentation

diff --git a/clutter/clutter-label.c b/clutter/clutter-label.c
index 8884cd3..d192199 100644 (file)
--- a/clutter/clutter-label.c
+++ b/clutter/clutter-label.c
@@ -527,7 +527,7 @@ clutter_label_set_text_extents (ClutterLabel *label,
  * @width: return location for the width of the extents or %NULL
  * @height: return location for the height of the extents or %NULL
  *
- * Returns the extents of the label.
+ * Gets the extents of the label.
  */
 void
 clutter_label_get_text_extents (ClutterLabel *label,

diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 39ac615..3576670 100644 (file)
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -904,10 +904,10 @@ clutter_texture_init (ClutterTexture *self)
 }
 
 /**
- * clutter_texture_get_pixbuf
- * @texture A #ClutterTexture
+ * clutter_texture_get_pixbuf:
+ * @texture: A #ClutterTexture
  *
- * Gets the underlying #GdkPixbuf for the #ClutterTexture
+ * Gets the underlying #GdkPixbuf for the #ClutterTexture.
  *
  * Return value: The underlying #GdkPixbuf
  **/
@@ -918,8 +918,8 @@ clutter_texture_get_pixbuf (ClutterTexture* texture)
 }
 
 /**
- * clutter_texture_set_pixbuf
- * @texture A #ClutterTexture
+ * clutter_texture_set_pixbuf:
+ * @texture: A #ClutterTexture
  * @pixbuf: A #GdkPixbuf
  *
  * Sets the underlying #GdkPixbuf for the #ClutterTexture
@@ -1017,7 +1017,7 @@ clutter_texture_set_pixbuf (ClutterTexture *texture, GdkPixbuf *pixbuf)
 }
 
 /**
- * clutter_texture_new_from_pixbuf
+ * clutter_texture_new_from_pixbuf:
  * @pixbuf: A #GdkPixbuf
  *
  * Creates a new #ClutterTexture object.
@@ -1035,7 +1035,7 @@ clutter_texture_new_from_pixbuf (GdkPixbuf *pixbuf)
 }
 
 /**
- * clutter_texture_new
+ * clutter_texture_new:
  *
  * Creates a new empty #ClutterTexture object.
  *
@@ -1052,7 +1052,7 @@ clutter_texture_new (void)
 }
 
 /**
- * clutter_texture_get_base_size
+ * clutter_texture_get_base_size:
  * @texture: A #ClutterTexture
  * @width:   Pointer to gint to be populated with width value if non NULL.
  * @height:  Pointer to gint to be populated with height value if non NULL.
@@ -1081,8 +1081,8 @@ clutter_texture_get_base_size (ClutterTexture *texture,
 }
 
 /**
- * clutter_texture_bind_tile
- * @texture A #ClutterTexture
+ * clutter_texture_bind_tile:
+ * @texture: A #ClutterTexture
  * @index: Tile index to bind
  *
  * Proxys a call to glBindTexture a to bind an internal 'tile'. 
@@ -1100,8 +1100,8 @@ clutter_texture_bind_tile (ClutterTexture *texture, gint index)
 }
 
 /**
- * clutter_texture_get_n_tiles
- * @texture A #ClutterTexture
+ * clutter_texture_get_n_tiles:
+ * @texture: A #ClutterTexture
  * @n_x_tiles: Location to store number of tiles in horizonally axis
  * @n_y_tiles: Location to store number of tiles in vertical axis
  *
@@ -1124,8 +1124,8 @@ clutter_texture_get_n_tiles (ClutterTexture *texture,
 }
 
 /**
- * clutter_texture_get_x_tile_detail
- * @texture A #ClutterTexture
+ * clutter_texture_get_x_tile_detail:
+ * @texture: A #ClutterTexture
  * @x_index: X index of tile to query
  * @pos: Location to store tiles X position
  * @size: Location to store tiles horizontal size in pixels 
@@ -1156,9 +1156,9 @@ clutter_texture_get_x_tile_detail (ClutterTexture *texture,
 }
 
 /**
- * clutter_texture_get_y_tile_detail
- * @texture A #ClutterTexture
- * @x_index: Y index of tile to query
+ * clutter_texture_get_y_tile_detail:
+ * @texture: A #ClutterTexture
+ * @y_index: Y index of tile to query
  * @pos: Location to store tiles Y position
  * @size: Location to store tiles vertical size in pixels 
  * @waste: Location to store tiles vertical wastage in pixels
@@ -1188,8 +1188,8 @@ clutter_texture_get_y_tile_detail (ClutterTexture *texture,
 }
 
 /**
- * clutter_texture_has_generated_tiles
- * @texture A #ClutterTexture
+ * clutter_texture_has_generated_tiles:
+ * @texture: A #ClutterTexture
  *
  * Checks if #ClutterTexture has generated underlying GL texture tiles.
  *
@@ -1205,8 +1205,8 @@ clutter_texture_has_generated_tiles (ClutterTexture *texture)
 }
 
 /**
- * clutter_texture_has_generated_tiles
- * @texture A #ClutterTexture
+ * clutter_texture_has_generated_tiles:
+ * @texture: A #ClutterTexture
  *
  * Checks if #ClutterTexture is tiled.
  *

diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index cb35b46..ffc1b1d 100644 (file)
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -445,7 +445,7 @@ clutter_timeline_get_n_frames (ClutterTimeline *timeline)
 }
 
 /**
- * clutter_timeline_get_current_frame:
+ * clutter_timeline_set_speed:
  * @timeline: A #ClutterTimeline
  * @fps: New speed of timeline as frames per second
  *

diff --git a/clutter/clutter-video-texture.c b/clutter/clutter-video-texture.c
index 2d70764..fc1bfc1 100644 (file)
--- a/clutter/clutter-video-texture.c
+++ b/clutter/clutter-video-texture.c
@@ -152,10 +152,10 @@ set_uri (ClutterMedia *media,
   if (uri) 
     gst_element_set_state (priv->playbin, state);
   
-  /**
+  /*
    * Emit notififications for all these to make sure UI is not showing
    * any properties of the old URI.
-   **/
+   */
   g_object_notify (G_OBJECT (video_texture), "uri");
   g_object_notify (G_OBJECT (video_texture), "can-seek");
   g_object_notify (G_OBJECT (video_texture), "duration");
@@ -648,10 +648,10 @@ bus_message_state_change_cb (GstBus            *bus,
                                 NULL,
                                 NULL);
       } else {
-       /**
+       /*
         * Could not query for ability to seek. Determine
         * using URI.
-        **/
+        */
        
        if (g_str_has_prefix (video_texture->priv->uri,
                              "http://")) {