dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

actions, plug-ins: Minor clean-up and warning fix 

*In file-pnm, format_name is no longer
used due to changes in exporting
functions. This was creating a warning
about an unused variable.

*In 519f301c, an attempt to add a
short-key for MacOS Settings was left in.
It did not work because "comma" should
be spelled out rather than using ",". This
patch removes the accelerator.
This commit is contained in:
Alx Sa 2024-05-28 16:16:29 +00:00
parent e2748a2e4f
commit 83141ba62d
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/actions/dialogs-actions.c
View File

@ -310,12 +310,11 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
#if defined(PLATFORM_OSX)
NC_("dialogs-action", "_Settings..."),
NC_("dialogs-action", "_Settings..."),
{ "<primary>,", NULL },
#else
NC_("dialogs-action", "_Preferences"),
NC_("dialogs-action", "_Preferences"),
{ NULL },
#endif
{ NULL },
NC_("dialogs-action", "Open the preferences dialog"),
"gimp-preferences-dialog",
GIMP_HELP_PREFS_DIALOG },

17
plug-ins/common/file-pnm.c
View File

@ -583,12 +583,11 @@ pnm_export (GimpProcedure *procedure,
GimpProcedureConfig *config,
gpointer run_data)
{
FileType file_type = GPOINTER_TO_INT (run_data);
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
GimpExportReturn export = GIMP_EXPORT_IGNORE;
FileType file_type = GPOINTER_TO_INT (run_data);
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
GimpExportReturn export = GIMP_EXPORT_IGNORE;
GList *drawables;
const gchar *format_name = NULL;
GError *error = NULL;
GError *error = NULL;
gegl_init (NULL, NULL);
@ -601,7 +600,6 @@ pnm_export (GimpProcedure *procedure,
switch (file_type)
{
case FILE_TYPE_PNM:
format_name = "PNM";
export = gimp_export_image (&image, "PNM",
GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_GRAY |
@ -609,26 +607,22 @@ pnm_export (GimpProcedure *procedure,
break;
case FILE_TYPE_PBM:
format_name = "PBM";
export = gimp_export_image (&image, "PBM",
GIMP_EXPORT_CAN_HANDLE_BITMAP);
break;
case FILE_TYPE_PGM:
format_name = "PGM";
export = gimp_export_image (&image, "PGM",
GIMP_EXPORT_CAN_HANDLE_GRAY);
break;
case FILE_TYPE_PPM:
format_name = "PPM";
export = gimp_export_image (&image, "PPM",
GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_INDEXED);
break;
case FILE_TYPE_PAM:
format_name = "PAM";
export = gimp_export_image (&image, "PAM",
GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_GRAY |
@ -637,7 +631,6 @@ pnm_export (GimpProcedure *procedure,
break;
case FILE_TYPE_PFM:
format_name = "PFM";
export = gimp_export_image (&image, "PFM",
GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_GRAY);
@ -660,7 +653,7 @@ pnm_export (GimpProcedure *procedure,
if (status == GIMP_PDB_SUCCESS)
{
if (! export_image (file, image, drawables->data, file_type,
if (! export_image (file, image, drawables->data, file_type,
G_OBJECT (config), &error))
{
status = GIMP_PDB_EXECUTION_ERROR;