From 51d28c39cc994104cad5c14cb5298a22ee6e195e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 22 Jun 2009 15:39:50 +0100 Subject: [PATCH] [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. --- clutter-gtk/gtk-clutter-zoomable.c | 4 ++-- clutter-gtk/gtk-clutter-zoomable.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/clutter-gtk/gtk-clutter-zoomable.c b/clutter-gtk/gtk-clutter-zoomable.c index 58bd93b..6758ac0 100644 --- 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 --- 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); }; -- 1.7.9.5