summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2011-10-04 03:19:11 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2011-10-04 16:44:39 -0400
commitf82966adb5afbfdb51d0d5878820dfd51b715f26 (patch)
tree64fee3a3739bfb461a572a7e1c5e8edbfe7cce79
parent9f54f1d75d2eae557e982454682080b201917e0c (diff)
downloadmutter-f82966adb5afbfdb51d0d5878820dfd51b715f26.tar.gz
Various annotation fixes
https://bugzilla.gnome.org/show_bug.cgi?id=660854
-rw-r--r--src/compositor/meta-shaped-texture.c2
-rw-r--r--src/compositor/meta-texture-tower.c8
-rw-r--r--src/core/screen.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index 8650fe977..7aa8f9e4f 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -772,7 +772,7 @@ meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
/**
* meta_shaped_texture_set_clip_region:
- * @frame: a #TidyTextureframe
+ * @frame: a #MetaShapedTexture
* @clip_region: (transfer full): the region of the texture that
* is visible and should be painted. OWNERSHIP IS ASSUMED BY
* THE FUNCTION (for efficiency to avoid a copy.)
diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
index 551450ca1..8dbe62e7e 100644
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@@ -111,8 +111,8 @@ texture_is_rectangle (CoglHandle texture)
#endif /* GL_TEXTURE_RECTANGLE_ARB */
/**
- * meta_texture_tower_update_area:
- * @tower: a MetaTextureTower
+ * meta_texture_tower_set_base_texture:
+ * @tower: a #MetaTextureTower
* @texture: the new texture used as a base for scaled down versions
*
* Sets the base texture that is the scaled texture that the
@@ -175,7 +175,7 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,
/**
* meta_texture_tower_update_area:
- * @tower: a MetaTextureTower
+ * @tower: a #MetaTextureTower
* @x: X coordinate of upper left of rectangle that changed
* @y: Y coordinate of upper left of rectangle that changed
* @width: width of rectangle that changed
@@ -579,7 +579,7 @@ texture_tower_revalidate (MetaTextureTower *tower,
/**
* meta_texture_tower_get_paint_texture:
- * @tower: a MetaTextureTower
+ * @tower: a #MetaTextureTower
*
* Gets the texture from the tower that best matches the current
* rendering scale. (On the assumption here the texture is going to
diff --git a/src/core/screen.c b/src/core/screen.c
index 020940b91..ee286662b 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -3490,6 +3490,14 @@ meta_screen_get_xroot (MetaScreen *screen)
return screen->xroot;
}
+/**
+ * meta_screen_get_size:
+ * @screen: A #MetaScreen
+ * @width: (out): The width of the screen
+ * @height: (out): The height of the screen
+ *
+ * Retrieve the size of the screen.
+ */
void
meta_screen_get_size (MetaScreen *screen,
int *width,