more introspection fiddling

configure.in

@@ -33,8 +33,8 @@ GOBJECT_INTROSPECTION_CHECK([0.6.7])
 # see also IGNORE_HFILES in doc/reference/Makefile.am
 # the only header we include is the main vips.h one, it'll pull in everythiung
 # else in the public API
-introspection_sources=`cd libvips ; find . -name "*.[[hc]]"`
-filter_list="deprecated im_video_v4l1.c type.h draw.h dispatch.h transform.h sink.h mask.h merge.h debug.h internal.h intl.h CImg.h im_video_v4l1.h global_balance.h dbh.h base64.h templates.h mosaic.h deprecated.h thread.h private.h internal.h almostdeprecated.h inlines.h struct.h disp.h vector.h vips7compat.h"
+introspection_sources=`cd libvips ; find . -name "*.c"`
+filter_list="deprecated im_video_v4l1.c"
 
 introspection_sources2=
 for name in $introspection_sources; do
@@ -51,7 +51,15 @@ for name in $introspection_sources; do
     introspection_sources2="$introspection_sources2 $name"
   fi      
 done    
-vips_introspection_sources="$introspection_sources2 include/vips/vips.h"
+vips_introspection_sources="$introspection_sources2"
+
+# add headers that form the public vips8 API .. don't do a find and exclude,
+# we end up excluding almost everything argh
+headers="vips.h object.h image.h error.h format.h region.h interpolate.h header.h operation.h enumtypes.h arithmetic.h"
+for name in $headers; do
+  vips_introspection_sources="$vips_introspection_sources include/vips/$name"
+done
+
 AC_SUBST(vips_introspection_sources)
 
 # libtool library versioning ... not user-visible (except as part of the

libvips/Makefile.am

@@ -96,6 +96,7 @@ Vips_8_0_gir_SCANNERFLAGS = \
 			    --verbose \
 			    --namespace=Vips \
 			    --identifier-prefix=Vips \
+			    --identifier-prefix=vips \
 			    --symbol-prefix=vips \
 			    --symbol-prefix=im \
 			    --symbol-prefix=im_ 

libvips/include/vips/header.h

@@ -103,7 +103,7 @@ GType vips_image_get_typeof( VipsImage *image, const char *field );
 gboolean vips_image_remove( VipsImage *image, const char *field );
 typedef void *(*VipsImageMapFn)( VipsImage *image, 
 	const char *field, GValue *value, void *a );
-void *vips_image_map( VipsImage *im, VipsImageMapFn fn, void *a );
+void *vips_image_map( VipsImage *image, VipsImageMapFn fn, void *a );
 
 /**
  * VIPS_TYPE_SAVE_STRING:
@@ -157,7 +157,7 @@ int vips_image_set_area( VipsImage *image,
 int vips_image_get_area( VipsImage *image, const char *field, void **data );
 int vips_image_set_string( VipsImage *image, 
 	const char *field, const char *str );
-int vips_image_get_string( VipsImage *image, const char *field, char **str );
+int vips_image_get_string( VipsImage *image, const char *field, char **out );
 int vips_image_set_blob( VipsImage *image, const char *field, 
 	VipsCallbackFn free_fn, void *data, size_t length );
 int vips_image_get_blob( VipsImage *image, const char *field, 

libvips/include/vips/object.h

@@ -152,12 +152,14 @@ typedef struct _VipsArgumentInstance {
  */
 typedef GHashTable VipsArgumentTable;
 
-VipsArgumentInstance *vips__argument_get_instance( VipsArgumentClass *,
-	VipsObject *);
-VipsArgument *vips__argument_table_lookup( VipsArgumentTable *, 
-	GParamSpec *);
-typedef void *(*VipsArgumentMapFn)( VipsObject *, GParamSpec *,
-	VipsArgumentClass *, VipsArgumentInstance *, void *a, void *b );
+VipsArgumentInstance *vips__argument_get_instance( 
+	VipsArgumentClass *argument_class,
+	VipsObject *object);
+VipsArgument *vips__argument_table_lookup( VipsArgumentTable *table, 
+	GParamSpec *pspec);
+typedef void *(*VipsArgumentMapFn)( VipsObject *object, GParamSpec *pspec,
+	VipsArgumentClass *argument_class, 
+	VipsArgumentInstance *argument_instance, void *a, void *b );
 void *vips_argument_map( VipsObject *object, 
 	VipsArgumentMapFn fn, void *a, void *b );
 void vips_argument_dispose_all( VipsObject *object );
@@ -344,8 +346,8 @@ typedef void *(*VipsTypeMap)( GType, void * );
 typedef void *(*VipsTypeMap2)( GType, void *, void * );
 typedef void *(*VipsClassMap)( VipsObjectClass *, void * );
 void *vips_type_map( GType base, VipsTypeMap2 fn, void *a, void *b );
-void *vips_type_map_concrete_all( GType base, VipsTypeMap fn, void *a );
-void *vips_class_map_concrete_all( GType base, VipsClassMap fn, void *a );
+void *vips_type_map_all( GType base, VipsTypeMap fn, void *a );
+void *vips_class_map_all( GType base, VipsClassMap fn, void *a );
 VipsObjectClass *vips_class_find( const char *basename, const char *nickname );
 GType vips_type_find( const char *basename, const char *nickname );
 

libvips/include/vips/region.h

@@ -99,7 +99,7 @@ typedef struct _VipsRegionClass {
 
 GType vips_region_get_type( void );
 
-VipsRegion *vips_region_new( VipsImage *im );
+VipsRegion *vips_region_new( VipsImage *image );
 
 int vips_region_buffer( VipsRegion *reg, VipsRect *r );
 int vips_region_image( VipsRegion *reg, VipsRect *r );

libvips/iofuncs/header.c

@@ -441,9 +441,9 @@ vips_image_get_data( VipsImage *image )
  * @xsize: image width
  * @ysize: image height
  * @bands: image bands
- * @bandfmt: band format
+ * @format: band format
  * @coding: image coding
- * @type: image type
+ * @interpretation: image type
  * @xres: horizontal resolution, pixels per millimetre
  * @yres: vertical resolution, pixels per millimetre
  *
@@ -1898,7 +1898,7 @@ vips_image_history_printf( VipsImage *image, const char *fmt, ... )
 
 /**
  * vips_image_history_args:
- * @out: image to attach history line to
+ * @image: image to attach history line to
  * @name: program name
  * @argc: number of program arguments
  * @argv: program arguments

libvips/iofuncs/image.c

@@ -1507,8 +1507,8 @@ vips_image_new( void )
 /** 
  * vips_image_new_array:
  * @parent: images unref when this object unrefs
- * @OUT: array to fill with #VipsImage *
- * @N: array size
+ * @images: array to fill with #VipsImage *
+ * @n: array size
  *
  * Just like vips_image_new(), but opens an array of "p" images. 
  * Handy for creating a