From 116dc0ce2a73c05a011bb0964462ed7e76505037 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 3 Jun 2020 20:17:38 -0300
Subject: [PATCH] Fixing keypad property name.

---
 src/objects/keypad/attribute.c |  7 ++++---
 src/objects/keypad/model.c     |  9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/objects/keypad/attribute.c b/src/objects/keypad/attribute.c
index a565a3e..c93db18 100644
--- a/src/objects/keypad/attribute.c
+++ b/src/objects/keypad/attribute.c
@@ -47,7 +47,7 @@
 
  static void parse_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) {
 
- 	if( ((struct Attribute *) user_data)->translatable ) {
+ 	if(text && ((struct Attribute *) user_data)->translatable ) {
 		text = gettext(text);
  	}
 
@@ -109,11 +109,12 @@
 
 	data->spec = g_object_class_find_property(G_OBJECT_GET_CLASS(parent),name);
 	if(!data->spec) {
-		g_set_error_literal(
+		g_set_error(
 			error,
 			g_quark_from_static_string("keypad"),
 			ENOENT,
-			_( "Invalid or unknown property name" )
+			_( "Property \"%s\" is invalid for this object" ),
+			name
 		);
 		g_free(data);
 		return;
diff --git a/src/objects/keypad/model.c b/src/objects/keypad/model.c
index ae4fbd1..84d7d11 100644
--- a/src/objects/keypad/model.c
+++ b/src/objects/keypad/model.c
@@ -99,7 +99,7 @@
 
 	g_object_class_install_property(object_class, PROP_LABEL,
 		g_param_spec_string (
-			_("label"),
+			I_("label"),
 			N_("Keypad Label"),
 			N_("The Label of the keypad"),
 			NULL,
@@ -358,6 +358,11 @@
 
  const gchar * pw3270_keypad_model_get_label(GObject *model) {
 	g_return_val_if_fail(PW_IS_KEYPAD_MODEL(model), NULL);
-	return PW_KEYPAD_MODEL(model)->label;
+
+	const gchar *label = PW_KEYPAD_MODEL(model)->label;
+	if(label)
+		return label;
+
+	return pw3270_keypad_model_get_name(model);
  }
 
--
libgit2 0.21.2