be more careful about temp delete

libvips can change ->filename behind our back, have our own filename

Author: jcupitt

ChangeLog

@@ -2,6 +2,7 @@ started 8.3.1 on 19/5/16
 - disable debug by default, thanks Benjamin
 - configure changes to help win64
 - fix middle-drag in ws and image view
+- be more careful about the name of the image file we remove on close
 
 started 8.3.0 on 28/3/16
 - move path search stuff into _convert from _magick

src/imageinfo.c

@@ -492,11 +492,15 @@ imageinfo_finalize( GObject *gobject )
 	IM_FREEF( im_close, imageinfo->mapped_im );
 	IM_FREEF( im_close, imageinfo->identity_lut );
 
-	if( imageinfo->dfile && isfile ) {
-		unlinkf( "%s", name );
+	if( imageinfo->dfile && 
+		imageinfo->delete_name &&
+		isfile ) {
+		unlinkf( "%s", imageinfo->delete_name );
 		iobject_changed( IOBJECT( main_imageinfogroup ) );
 	}
 
+	VIPS_FREE( imageinfo->delete_name );
+
 	MANAGED_UNREF( imageinfo->underlying );
 
 	imageinfo_undo_free( imageinfo );
@@ -626,6 +630,7 @@ imageinfo_init( Imageinfo *imageinfo )
 	imageinfo->proxy = NULL;
 
 	imageinfo->dfile = FALSE;
+	imageinfo->delete_name = NULL;
 	imageinfo->from_file = FALSE;
 	imageinfo->mtime = 0;
 	imageinfo->exprs = NULL;
@@ -812,6 +817,7 @@ imageinfo_new_temp( Imageinfogroup *imageinfogroup,
 		return( NULL );
 	}
 	imageinfo->dfile = TRUE;
+	VIPS_SETSTR( imageinfo->delete_name, tname );
 
 	return( imageinfo );
 }

src/imageinfo.h

@@ -121,6 +121,7 @@ struct _Imageinfo {
 	Imageinfoproxy *proxy;	/* Proxy for IMAGE callbacks */
 
 	gboolean dfile;		/* delete_file on final close */
+	char *delete_name;	/* the filename we unlink */
 
 	gboolean from_file;	/* Set if ->name is a user file */
 	time_t mtime;		/* What mtime was when we loaded this file */

src/ip.h

@@ -147,7 +147,6 @@ extern int statfs();
 #include <goffice/graph/gog-legend.h>
 #include <goffice/graph/gog-chart-map.h>
 
-#include <goffice/gtk/go-graph-widget.h>
 
 #include <goffice/utils/go-color.h>
 #include <goffice/utils/go-marker.h>