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

app, pdb: gimp_image_set_file() should accept compressed XCF variants.

This commit is contained in:
Jehan 2024-03-05 10:32:14 +01:00
parent 5fd29d7f9a
commit fade73664e
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/pdb/image-cmds.c
View File

@ -2293,23 +2293,21 @@ image_set_file_invoker (GimpProcedure *procedure,
{
gchar *uri;
gchar *folded_uri;
gchar *folded_ext;
uri = g_file_get_uri (file);
folded_uri = g_utf8_casefold (uri, -1);
folded_ext = g_utf8_casefold (".xcf", -1);
if (! g_str_has_suffix (folded_uri, folded_ext))
if (! g_regex_match_simple ("\\.xcf(\\.?(gz|bz2|xz))?$", uri, G_REGEX_CASELESS, 0))
{
gchar *dot = g_strrstr (uri, ".");
if (dot != NULL && strstr (dot + 1, G_DIR_SEPARATOR_S) == NULL)
g_printerr ("%s: failure to set file '%s' with extension '%s'. "
"The extension must be '.xcf'.\n",
"The extension must be '.xcf' (or a compressed variant).\n",
"gimp_image_set_file", uri, dot + 1);
else
g_printerr ("%s: failure to set file '%s' without extension. "
"The extension must be '.xcf'.\n",
"The extension must be '.xcf' (or a compressed variant).\n",
"gimp_image_set_file", uri);
success = FALSE;
@ -2319,7 +2317,6 @@ image_set_file_invoker (GimpProcedure *procedure,
g_free (uri);
g_free (folded_uri);
g_free (folded_ext);
}
return gimp_procedure_get_return_values (procedure, success,

9
pdb/groups/image.pdb
View File

@ -2379,23 +2379,21 @@ HELP
{
gchar *uri;
gchar *folded_uri;
gchar *folded_ext;
uri = g_file_get_uri (file);
folded_uri = g_utf8_casefold (uri, -1);
folded_ext = g_utf8_casefold (".xcf", -1);
if (! g_str_has_suffix (folded_uri, folded_ext))
if (! g_regex_match_simple ("\\.xcf(\\.?(gz|bz2|xz))?$", uri, G_REGEX_CASELESS, 0))
{
gchar *dot = g_strrstr (uri, ".");
if (dot != NULL && strstr (dot + 1, G_DIR_SEPARATOR_S) == NULL)
g_printerr ("%s: failure to set file '%s' with extension '%s'. "
"The extension must be '.xcf'.\n",
"The extension must be '.xcf' (or a compressed variant).\n",
"gimp_image_set_file", uri, dot + 1);
else
g_printerr ("%s: failure to set file '%s' without extension. "
"The extension must be '.xcf'.\n",
"The extension must be '.xcf' (or a compressed variant).\n",
"gimp_image_set_file", uri);
success = FALSE;
@ -2405,7 +2403,6 @@ HELP
g_free (uri);
g_free (folded_uri);
g_free (folded_ext);
}
CODE
);