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



commit dfbf1d5d7b89bdddc5ffb96ccc02e836dfd4cb92
Author: Érico Rolim <erico erc gmail com>
Date:   Fri Dec 11 23:16:36 2020 -0300

    app/widgets/gimpactiongroup: protect against calling gettext with NULL msgid
    
    Use the same conditional that was being used for
    g_dpgettext2(entries[i].tooltip) with gettext(entries[i].tooltip).

 app/widgets/gimpactiongroup.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c
index 972b0cba0a..10cb415136 100644
--- a/app/widgets/gimpactiongroup.c
+++ b/app/widgets/gimpactiongroup.c
@@ -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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]