[gimp] libgimpwidgets: in GimpEnumLabel use the value's nick if there is no desc



commit a69b8a25dff7990008e297ad8a7ced8253ea0d8e
Author: Michael Natterer <mitch gimp org>
Date:   Wed May 16 21:11:16 2018 +0200

    libgimpwidgets: in GimpEnumLabel use the value's nick if there is no desc

 libgimpwidgets/gimpenumlabel.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/libgimpwidgets/gimpenumlabel.c b/libgimpwidgets/gimpenumlabel.c
index 0045984..1886f94 100644
--- a/libgimpwidgets/gimpenumlabel.c
+++ b/libgimpwidgets/gimpenumlabel.c
@@ -168,8 +168,8 @@ gimp_enum_label_set_property (GObject      *object,
 
 /**
  * gimp_enum_label_new:
- * @enum_type: the #GType of an enum.
- * @value:
+ * @enum_type: the #GType of an enum
+ * @value:     an enum value
  *
  * Return value: a new #GimpEnumLabel.
  *
@@ -190,7 +190,7 @@ gimp_enum_label_new (GType enum_type,
 /**
  * gimp_enum_label_set_value
  * @label: a #GimpEnumLabel
- * @value:
+ * @value: an enum value
  *
  * Since: 2.4
  **/
@@ -198,12 +198,13 @@ void
 gimp_enum_label_set_value (GimpEnumLabel *label,
                            gint           value)
 {
+  const gchar *nick;
   const gchar *desc;
 
   g_return_if_fail (GIMP_IS_ENUM_LABEL (label));
 
   if (! gimp_enum_get_value (G_TYPE_FROM_CLASS (label->enum_class), value,
-                             NULL, NULL, &desc, NULL))
+                             NULL, &nick, &desc, NULL))
     {
       g_warning ("%s: %d is not valid for enum of type '%s'",
                  G_STRLOC, value,
@@ -211,5 +212,8 @@ gimp_enum_label_set_value (GimpEnumLabel *label,
       return;
     }
 
+  if (! desc)
+    desc = nick;
+
   gtk_label_set_text (GTK_LABEL (label), desc);
 }


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