From b08a928dd0a26e453cb9a03d1ee6e729c9a3bc8d Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 10 Dec 2019 17:02:33 -0300 Subject: [PATCH] Using action name as the last resort. --- src/terminal/keyboard/accelerator.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/terminal/keyboard/accelerator.c b/src/terminal/keyboard/accelerator.c index 9504a05..674ee8a 100644 --- a/src/terminal/keyboard/accelerator.c +++ b/src/terminal/keyboard/accelerator.c @@ -89,17 +89,34 @@ switch(accel->type) { case V3270_ACCELERATOR_TYPE_LIB3270_ACTION: - return gettext(((LIB3270_ACTION *) accel->arg)->summary); + + if( ((LIB3270_ACTION *) accel->arg)->summary ) + return gettext(((LIB3270_ACTION *) accel->arg)->summary); + + if( ((LIB3270_ACTION *) accel->arg)->description ) + return gettext(((LIB3270_ACTION *) accel->arg)->description); + + break; case V3270_ACCELERATOR_TYPE_INTERNAL: - return ((V3270_ACTION *) accel->arg)->summary; + if( ((V3270_ACTION *) accel->arg)->summary ) + return ((V3270_ACTION *) accel->arg)->summary; + + break; case V3270_ACCELERATOR_TYPE_LIB3270_TOGGLE: - return ((LIB3270_TOGGLE *) accel->arg)->summary; + + if(((LIB3270_TOGGLE *) accel->arg)->summary) + return ((LIB3270_TOGGLE *) accel->arg)->summary; + + if(((LIB3270_TOGGLE *) accel->arg)->description) + return ((LIB3270_TOGGLE *) accel->arg)->description; + + break; } - return NULL; + return v3270_accelerator_get_name(accel); } const gchar * v3270_accelerator_get_name(const V3270Accelerator * accel) -- libgit2 0.21.2