Fix the new_with_image constructor and doc

diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c
index 415e1bb0195444ebcf982408d6bf54740e0de7ee..dae88cfe1b078e532521a0e2a75684da1ae6a9e0 100644 (file)
--- 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 f7d2157434b5af6731f366b1fa5e8238c792ab01..2fffd89b890356da9e0a9fd3a61bd5cd41f0a93a 100644 (file)
--- 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);