From f04cf9cf2cd837faf3ecf76fc5b7eb7ce9467996 Mon Sep 17 00:00:00 2001 From: Emmanuel Rodriguez Date: Mon, 13 Apr 2009 14:54:35 -0400 Subject: [PATCH] Fix the new_with_image constructor and doc --- champlain/champlain-marker.c | 10 ++++------ champlain/champlain-marker.h | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c index 415e1bb..dae88cf 100644 --- a/champlain/champlain-marker.c +++ b/champlain/champlain-marker.c @@ -617,17 +617,15 @@ champlain_marker_new_with_text (const gchar *text, /** * champlain_marker_new_with_image: - * @filename: The filename of the image. - * @error: Return location for an error. + * @actor: The actor of the image. * * Returns a new #ChamplainMarker with a drawn marker containing the given * image. * - * Since: 0.2 + * Since: 0.4 */ ClutterActor * -champlain_marker_new_with_image (ClutterActor *actor, - GError **error) +champlain_marker_new_with_image (ClutterActor *actor) { ChamplainMarker *marker = CHAMPLAIN_MARKER (champlain_marker_new ()); if (actor != NULL) @@ -646,7 +644,7 @@ champlain_marker_new_with_image (ClutterActor *actor, * Returns a new #ChamplainMarker with a drawn marker containing the given * image. * - * Since: 0.2 + * Since: 0.4 */ ClutterActor * champlain_marker_new_from_file (const gchar *filename, diff --git a/champlain/champlain-marker.h b/champlain/champlain-marker.h index f7d2157..2fffd89 100644 --- a/champlain/champlain-marker.h +++ b/champlain/champlain-marker.h @@ -61,8 +61,7 @@ ClutterActor *champlain_marker_new (void); ClutterActor *champlain_marker_new_with_text (const gchar *text, const gchar *font, ClutterColor *text_color, ClutterColor *marker_color); -ClutterActor *champlain_marker_new_with_image (ClutterActor *actor, - GError **error); +ClutterActor *champlain_marker_new_with_image (ClutterActor *actor); ClutterActor *champlain_marker_new_from_file (const gchar *filename, GError **error); -- 2.39.5