fixed some build errors found by gcc14 stricter handling

gphoto · Nov 18, 2024 · 2bf43d9 · 2bf43d9
1 parent d17f512
commit 2bf43d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/gtkam-gimp.c b/src/gtkam-gimp.c
@@ -457,7 +457,7 @@ run_load (gchar *name, gint nparams, GimpParam *param, gint *nreturn_vals,
 }
 
 static void
-run (gchar *name, gint nparams, GimpParam *params, gint *nreturn_vals,
+run (const gchar *name, gint nparams, const GimpParam *params, gint *nreturn_vals,
      GimpParam **return_vals)
 {
 	static GimpParam values[1];

diff --git a/src/gtkam-main.c b/src/gtkam-main.c
@@ -452,12 +452,12 @@ action_about (GtkAction *action, gpointer callback_data)
 
 	for (n = 0; module_versions[n].name != NULL; n++) {
 		gchar *features;
-		const char **v = NULL;
+		char **v = NULL;
 		char *name = module_versions[n].name;
 		GPVersionFunc func = module_versions[n].version_func;
 		CHECK_NULL (name);
 		CHECK_NULL (func);
-		v = func(GP_VERSION_SHORT);
+		v = (char**)func(GP_VERSION_SHORT);
 		CHECK_NULL (v);
 		CHECK_NULL (v[0]);
 		CHECK_NULL (v[1]);

diff --git a/src/gtkam-preview.c b/src/gtkam-preview.c
@@ -45,6 +45,8 @@
 
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
 
+#include <gphoto2/gphoto2-setting.h>
+
 #include "gdk-pixbuf-hacks.h"
 
 #include <gphoto2/gphoto2-setting.h>
@@ -564,7 +566,7 @@ gtkam_preview_new (GtkamCamera *camera)
             G_CALLBACK (on_button_file_selection_changed), preview);
 
 	if (gp_setting_get ("gtkam-preview", "download_folder", buf) == GP_OK) {
-		gtk_file_chooser_set_filename (preview->priv->button_file, buf);
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (preview->priv->button_file), buf);
 	}
 	if (gp_setting_get ("gtkam-preview", "direct_download", buf) == GP_OK) {
 		gtk_toggle_button_set_active (