[zoomable] Fix Introspection data generation

* Add annotations to the Zoomable methods.

* Fix the naming of the arguments for the set_adjustment() virtual
  function, so that g-ir-scanner doesn't get confused.

diff --git a/clutter-gtk/gtk-clutter-zoomable.c b/clutter-gtk/gtk-clutter-zoomable.c
index 58bd93b..6758ac0 100644 (file)
--- a/clutter-gtk/gtk-clutter-zoomable.c
+++ b/clutter-gtk/gtk-clutter-zoomable.c
@@ -70,7 +70,7 @@ gtk_clutter_zoomable_get_type (void)
 /**
  * gtk_clutter_zoomable_set_adjustment:
  * @zoomable: a #GtkClutterZoomable
- * @z_adjust: a #GtkAdjustment, or %NULL
+ * @z_adjust: (null-ok): a #GtkAdjustment, or %NULL
  *
  * Sets the adjustment used to determine the zoom factor of
  * the zoomable actor
@@ -98,7 +98,7 @@ gtk_clutter_zoomable_set_adjustment (GtkClutterZoomable *zoomable,
  * Retrieves the adjustment used to determine the zoom factor of
  * the zoomable actor
  *
- * Return value: a #GtkAdjustment
+ * Return value: (transfer none): a #GtkAdjustment
  *
  * Since: 1.0
  */

diff --git a/clutter-gtk/gtk-clutter-zoomable.h b/clutter-gtk/gtk-clutter-zoomable.h
index 1896d0d..6c0de01 100644 (file)
--- a/clutter-gtk/gtk-clutter-zoomable.h
+++ b/clutter-gtk/gtk-clutter-zoomable.h
@@ -34,7 +34,8 @@ struct _GtkClutterZoomableIface
 
   /*< public >*/
   void           (* set_adjustment) (GtkClutterZoomable *zoomable,
-                                     GtkAdjustment      *adjustment);
+                                     GtkAdjustment      *z_adjust);
+
   GtkAdjustment *(* get_adjustment) (GtkClutterZoomable *zoomable);
 };