another progress polish

Author: jcupitt

src/imagewindow.c

@@ -262,14 +262,6 @@ image_window_bestfit( ImageWindow *win )
 	}
 }
 
-static void
-image_window_preeval( VipsImage *image, 
-	VipsProgress *progress, ImageWindow *win )
-{
-	gtk_action_bar_set_revealed( GTK_ACTION_BAR( win->progress_bar ), 
-		TRUE );
-}
-
 typedef struct _EvalUpdate {
 	ImageWindow *win;
 	int eta;
@@ -285,6 +277,11 @@ image_window_eval_idle( void *user_data )
 	char str[256];
 	VipsBuf buf = VIPS_BUF_STATIC( str );
 
+	// you'd think we could do this in preeval, but it doesn't always seem to
+	// fire for some reason
+	gtk_action_bar_set_revealed( GTK_ACTION_BAR( win->progress_bar ), 
+		TRUE );
+
 	vips_buf_appendf( &buf, "%d%% complete, %d seconds to go",
 		update->percent, update->eta );
 	gtk_progress_bar_set_text( GTK_PROGRESS_BAR( win->progress ),
@@ -1465,8 +1462,6 @@ image_window_set_tile_source( ImageWindow *win, TileSource *tile_source )
 		"tile-cache", win->tile_cache,
 		NULL );
 
-	g_signal_connect_object( win->tile_source, "preeval", 
-		G_CALLBACK( image_window_preeval ), win, 0 );
 	g_signal_connect_object( win->tile_source, "eval", 
 		G_CALLBACK( image_window_eval ), win, 0 );
 	g_signal_connect_object( win->tile_source, "posteval", 

src/saveoptions.c

@@ -81,14 +81,6 @@ save_options_error_response( GtkWidget *button, int response,
 	save_options_error_hide( options );
 }
 
-static void
-save_options_preeval( VipsImage *image, 
-	VipsProgress *progress, SaveOptions *options )
-{
-	gtk_action_bar_set_revealed( GTK_ACTION_BAR( options->progress_bar ), 
-		TRUE );
-}
-
 static void
 save_options_eval( VipsImage *image, 
 	VipsProgress *progress, SaveOptions *options )
@@ -110,6 +102,11 @@ save_options_eval( VipsImage *image,
 		return;
 	options->last_progress_time = time_now;
 
+	// you'd think we could do this in preeval, but it doesn't always seem to
+	// fire for some reason
+	gtk_action_bar_set_revealed( GTK_ACTION_BAR( options->progress_bar ), 
+		TRUE );
+
 	vips_buf_appendf( &buf, "%d%% complete, %d seconds to go",
 		progress->percent, progress->eta );
 	gtk_progress_bar_set_text( GTK_PROGRESS_BAR( options->progress ),
@@ -526,8 +523,6 @@ save_options_new( GtkWindow *parent_window,
 
 	if( options->image ) { 
 		vips_image_set_progress( options->image, TRUE ); 
-		g_signal_connect_object( options->image, "preeval", 
-			G_CALLBACK( save_options_preeval ), options, 0 );
 		g_signal_connect_object( options->image, "eval", 
 			G_CALLBACK( save_options_eval ), options, 0 );
 		g_signal_connect_object( options->image, "posteval",