dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app/widgets/gimpactiongroup: protect against calling gettext with NULL msgid

Browse source 
Use the same conditional that was being used for
g_dpgettext2(entries[i].tooltip) with gettext(entries[i].tooltip).
This commit is contained in:
Érico Rolim 2020-12-11 23:16:36 -03:00
parent aa151a08a0
commit dfbf1d5d7b
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/widgets/gimpactiongroup.c
View file

@ -407,7 +407,8 @@ gimp_action_group_add_actions (GimpActionGroup *group,
else
{
label = gettext (entries[i].label);
tooltip = gettext (entries[i].tooltip);
if (entries[i].tooltip)
tooltip = gettext (entries[i].tooltip);
}
action = gimp_action_impl_new (entries[i].name, label, tooltip,
@ -456,7 +457,8 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group,
else
{
label = gettext (entries[i].label);
tooltip = gettext (entries[i].tooltip);
if (entries[i].tooltip)
tooltip = gettext (entries[i].tooltip);
}
action = gimp_toggle_action_new (entries[i].name, label, tooltip,
@ -512,7 +514,8 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group,
else
{
label = gettext (entries[i].label);
tooltip = gettext (entries[i].tooltip);
if (entries[i].tooltip)
tooltip = gettext (entries[i].tooltip);
}
action = gimp_radio_action_new (entries[i].name, label, tooltip,
@ -574,7 +577,8 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group,
else
{
label = gettext (entries[i].label);
tooltip = gettext (entries[i].tooltip);
if (entries[i].tooltip)
tooltip = gettext (entries[i].tooltip);
}
action = gimp_enum_action_new (entries[i].name, label, tooltip,
@ -626,7 +630,8 @@ gimp_action_group_add_string_actions (GimpActionGroup *group,
else
{
label = gettext (entries[i].label);
tooltip = gettext (entries[i].tooltip);
if (entries[i].tooltip)
tooltip = gettext (entries[i].tooltip);
}
action = gimp_string_action_new (entries[i].name, label, tooltip,