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

libgimp, app: allow usage of GParamSpecString procedure arguments. 

Just consider these as a GimpParamSpecString with default allow_non_utf8
and non_empty values (FALSE).
This commit is contained in:
Jehan 2019-08-02 15:55:52 +02:00
parent 0787510810
commit 2c4a8c89ed
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/plug-in/gimpgpparams.c
View File

@ -139,7 +139,8 @@ _gimp_gp_param_def_to_param_spec (Gimp *gimp,
break; break;
case GP_PARAM_DEF_TYPE_STRING: case GP_PARAM_DEF_TYPE_STRING:
if (! strcmp (param_def->type_name, "GimpParamString")) if (! strcmp (param_def->type_name, "GimpParamString") ||
! strcmp (param_def->type_name, "GParamString"))
return gimp_param_spec_string (name, nick, blurb, return gimp_param_spec_string (name, nick, blurb,
param_def->meta.m_string.allow_non_utf8, param_def->meta.m_string.allow_non_utf8,
param_def->meta.m_string.null_ok, param_def->meta.m_string.null_ok,

20
libgimp/gimpgpparams-body.c
View File

@ -99,17 +99,27 @@ _gimp_param_spec_to_gp_param_def (GParamSpec *pspec,
param_def->meta.m_float.max_val = dspec->maximum; param_def->meta.m_float.max_val = dspec->maximum;
param_def->meta.m_float.default_val = dspec->default_value; param_def->meta.m_float.default_val = dspec->default_value;
} }
else if (pspec_type == GIMP_TYPE_PARAM_STRING) else if (pspec_type == GIMP_TYPE_PARAM_STRING ||
pspec_type == G_TYPE_PARAM_STRING)
{ {
GParamSpecString *gsspec = G_PARAM_SPEC_STRING (pspec); GParamSpecString *gsspec = G_PARAM_SPEC_STRING (pspec);
GimpParamSpecString *sspec = GIMP_PARAM_SPEC_STRING (pspec);
param_def->param_def_type = GP_PARAM_DEF_TYPE_STRING; param_def->param_def_type = GP_PARAM_DEF_TYPE_STRING;
param_def->meta.m_string.allow_non_utf8 = sspec->allow_non_utf8;
param_def->meta.m_string.null_ok = ! gsspec->ensure_non_null; param_def->meta.m_string.null_ok = ! gsspec->ensure_non_null;
param_def->meta.m_string.non_empty = sspec->non_empty;
param_def->meta.m_string.default_val = gsspec->default_value; param_def->meta.m_string.default_val = gsspec->default_value;
if (pspec_type == GIMP_TYPE_PARAM_STRING)
{
GimpParamSpecString *sspec = GIMP_PARAM_SPEC_STRING (pspec);
param_def->meta.m_string.allow_non_utf8 = sspec->allow_non_utf8;
param_def->meta.m_string.non_empty = sspec->non_empty;
}
else
{
param_def->meta.m_string.allow_non_utf8 = FALSE;
param_def->meta.m_string.non_empty = FALSE;
}
} }
else if (pspec_type == GIMP_TYPE_PARAM_RGB) else if (pspec_type == GIMP_TYPE_PARAM_RGB)
{ {