Download as
Browse Code »

Commit 116dc0ce2a73c05a011bb0964462ed7e76505037

Authored by Perry Werneck
1 parent bf5ea020
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Fixing keypad property name.

Showing 2 changed files with 11 additions and 5 deletions   Show diff stats
src/objects/keypad/attribute.c
  Diff comments   View file @116dc0c
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 47
48 static void parse_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) { 48 static void parse_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) {
49 49
50 - if( ((struct Attribute *) user_data)->translatable ) { 50 + if(text && ((struct Attribute *) user_data)->translatable ) {
51 text = gettext(text); 51 text = gettext(text);
52 } 52 }
53 53
@@ -109,11 +109,12 @@ @@ -109,11 +109,12 @@
109 109
110 data->spec = g_object_class_find_property(G_OBJECT_GET_CLASS(parent),name); 110 data->spec = g_object_class_find_property(G_OBJECT_GET_CLASS(parent),name);
111 if(!data->spec) { 111 if(!data->spec) {
112 - g_set_error_literal( 112 + g_set_error(
113 error, 113 error,
114 g_quark_from_static_string("keypad"), 114 g_quark_from_static_string("keypad"),
115 ENOENT, 115 ENOENT,
116 - _( "Invalid or unknown property name" ) 116 + _( "Property \"%s\" is invalid for this object" ),
  117 + name
117 ); 118 );
118 g_free(data); 119 g_free(data);
119 return; 120 return;
src/objects/keypad/model.c
  Diff comments   View file @116dc0c
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 99
100 g_object_class_install_property(object_class, PROP_LABEL, 100 g_object_class_install_property(object_class, PROP_LABEL,
101 g_param_spec_string ( 101 g_param_spec_string (
102 - _("label"), 102 + I_("label"),
103 N_("Keypad Label"), 103 N_("Keypad Label"),
104 N_("The Label of the keypad"), 104 N_("The Label of the keypad"),
105 NULL, 105 NULL,
@@ -358,6 +358,11 @@ @@ -358,6 +358,11 @@
358 358
359 const gchar * pw3270_keypad_model_get_label(GObject *model) { 359 const gchar * pw3270_keypad_model_get_label(GObject *model) {
360 g_return_val_if_fail(PW_IS_KEYPAD_MODEL(model), NULL); 360 g_return_val_if_fail(PW_IS_KEYPAD_MODEL(model), NULL);
361 - return PW_KEYPAD_MODEL(model)->label; 361 +
  362 + const gchar *label = PW_KEYPAD_MODEL(model)->label;
  363 + if(label)
  364 + return label;
  365 +
  366 + return pw3270_keypad_model_get_name(model);
362 } 367 }
363 368