more cleanups

jcupitt · jcupitt · commit c8a2ca391b2c · 2025-02-13T09:39:59.000-08:00
diff --git a/TODO b/TODO
@@ -1,11 +1,3 @@
-- never connected to button "activate", always to "clicked"
-
-	fix names of signal handlers (sometimes call them _pressed)
-
-- remove use of deprecated GtkInfoBar
-
-	use GtkActionBar instead, see imagewindow
-
 - try a flatpak build
 
 	will need a network connection
diff --git a/src/colourview.c b/src/colourview.c
@@ -95,7 +95,7 @@ colourview_class_init(ColourviewClass *class)
 	BIND_VARIABLE(Colourview, imagedisplay);
 	BIND_VARIABLE(Colourview, label);
 
-	BIND_CALLBACK(graphicview_click);
+	BIND_CALLBACK(graphicview_pressed);
 
 	object_class->dispose = colourview_dispose;
 
diff --git a/src/graphicview.c b/src/graphicview.c
@@ -63,7 +63,7 @@ graphicview_rowview(Graphicview *graphicview)
 }
 
 void
-graphicview_click(GtkGestureClick *gesture,
+graphicview_pressed(GtkGestureClick *gesture,
 	guint n_press, double x, double y, Graphicview *graphicview)
 {
 	if (n_press == 1) {
diff --git a/src/graphicview.h b/src/graphicview.h
@@ -55,6 +55,6 @@ typedef struct _GraphicviewClass {
 	 */
 } GraphicviewClass;
 
-void graphicview_click(GtkGestureClick *gesture,
+void graphicview_pressed(GtkGestureClick *gesture,
 	guint n_press, double x, double y, Graphicview *Graphicview);
 GType graphicview_get_type(void);
diff --git a/src/gtk/colourview.ui b/src/gtk/colourview.ui
@@ -9,7 +9,7 @@
         <child>
           <object class="GtkGestureClick">
 	    <property name="button">1</property>
-	    <signal name="pressed" handler="graphicview_click"/>
+	    <signal name="pressed" handler="graphicview_pressed"/>
           </object>
         </child>
 
diff --git a/src/gtk/iimageview.ui b/src/gtk/iimageview.ui
@@ -9,7 +9,7 @@
         <child>
           <object class="GtkGestureClick">
 	    <property name="button">1</property>
-	    <signal name="pressed" handler="graphicview_click"/>
+	    <signal name="pressed" handler="graphicview_pressed"/>
           </object>
         </child>
 
diff --git a/src/gtk/plotview.ui b/src/gtk/plotview.ui
@@ -9,7 +9,7 @@
         <child>
           <object class="GtkGestureClick">
 	    <property name="button">1</property>
-	    <signal name="pressed" handler="graphicview_click"/>
+	    <signal name="pressed" handler="graphicview_pressed"/>
           </object>
         </child>
 
diff --git a/src/gtk/valueview.ui b/src/gtk/valueview.ui
@@ -6,7 +6,7 @@
     <child>
       <object class="GtkGestureClick">
         <property name="button">1</property>
-        <signal name="pressed" handler="graphicview_click"/>
+        <signal name="pressed" handler="graphicview_pressed"/>
       </object>
     </child>
 
diff --git a/src/iimageview.c b/src/iimageview.c
@@ -184,7 +184,7 @@ iimageview_class_init(iImageviewClass *class)
 	BIND_VARIABLE(iImageview, imagedisplay);
 	BIND_VARIABLE(iImageview, label);
 
-	BIND_CALLBACK(graphicview_click);
+	BIND_CALLBACK(graphicview_pressed);
 
 	object_class->dispose = iimageview_dispose;
 
diff --git a/src/plotview.c b/src/plotview.c
@@ -118,7 +118,7 @@ plotview_class_init(PlotviewClass *class)
 	BIND_VARIABLE(Plotview, plotdisplay);
 	BIND_VARIABLE(Plotview, label);
 
-	BIND_CALLBACK(graphicview_click);
+	BIND_CALLBACK(graphicview_pressed);
 
 	gobject_class->dispose = plotview_dispose;
 
diff --git a/src/saveoptions.c b/src/saveoptions.c
@@ -576,9 +576,12 @@ save_options_new(GtkWindow *parent_window,
 	VipsImage *image, const char *filename)
 {
 	const char *saver;
-	SaveOptions *options;
+	if (!(saver = vips_foreign_find_save(filename))) {
+		error_vips_all();
+		return NULL;
+	}
 
-	options = g_object_new(SAVE_OPTIONS_TYPE,
+	g_autoptr(SaveOptions) options = g_object_new(SAVE_OPTIONS_TYPE,
 		"transient-for", parent_window,
 		"application", gtk_window_get_application(parent_window),
 		NULL);
@@ -591,6 +594,7 @@ 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",
@@ -599,10 +603,8 @@ save_options_new(GtkWindow *parent_window,
 			G_CALLBACK(save_options_posteval), options, 0);
 	}
 
-	if (!(saver = vips_foreign_find_save(filename)))
-		save_options_error(options);
-
-	if (saver && options->image) {
+	if (saver &&
+		options->image) {
 		int row;
 
 		options->save_operation = vips_operation_new(saver);
@@ -616,5 +618,5 @@ save_options_new(GtkWindow *parent_window,
 			save_options_add_options_fn, options, &row);
 	}
 
-	return options;
+	return g_steal_pointer(&options);
 }
diff --git a/src/util.c b/src/util.c
@@ -199,7 +199,8 @@ error_alert(GtkWidget *parent)
 		vips_error_exit(NULL);
 	}
 
-	GtkRoot *root = gtk_widget_get_root(parent);
+	GtkWindow *win = IS_VIEW(parent) ?
+		view_get_window(VIEW(parent)) : GTK_WINDOW(gtk_widget_get_root(parent));
 
 	GtkAlertDialog *alert;
 
@@ -208,7 +209,7 @@ error_alert(GtkWidget *parent)
 	gtk_alert_dialog_set_detail(alert, error_get_sub());
 	error_clear();
 	gtk_alert_dialog_set_modal(alert, TRUE);
-	gtk_alert_dialog_show(alert, GTK_WINDOW(root));
+	gtk_alert_dialog_show(alert, win);
 }
 
 /* Set an xml property printf() style.
diff --git a/src/valueview.c b/src/valueview.c
@@ -82,7 +82,7 @@ valueview_class_init(ValueviewClass *class)
 
 	BIND_VARIABLE(Valueview, label);
 
-	BIND_CALLBACK(graphicview_click);
+	BIND_CALLBACK(graphicview_pressed);
 
 	/* Create signals.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ graphicview_rowview(Graphicview *graphicview)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`void`
`66`		`-graphicview_click(GtkGestureClick *gesture,`
	`66`	`+graphicview_pressed(GtkGestureClick *gesture,`
`67`	`67`	`guint n_press, double x, double y, Graphicview *graphicview)`
`68`	`68`	`{`
`69`	`69`	`if (n_press == 1) {`