Download as
Browse Code »

Commit b08a928dd0a26e453cb9a03d1ee6e729c9a3bc8d

Authored by Perry Werneck
1 parent 53fe8d9a
Exists in master and in 1 other branch develop

Using action name as the last resort.

Showing 1 changed file with 21 additions and 4 deletions   Show diff stats
src/terminal/keyboard/accelerator.c
  Diff comments   View file @b08a928
@@ -89,17 +89,34 @@ @@ -89,17 +89,34 @@
89 switch(accel->type) 89 switch(accel->type)
90 { 90 {
91 case V3270_ACCELERATOR_TYPE_LIB3270_ACTION: 91 case V3270_ACCELERATOR_TYPE_LIB3270_ACTION:
92 - return gettext(((LIB3270_ACTION *) accel->arg)->summary); 92 +
  93 + if( ((LIB3270_ACTION *) accel->arg)->summary )
  94 + return gettext(((LIB3270_ACTION *) accel->arg)->summary);
  95 +
  96 + if( ((LIB3270_ACTION *) accel->arg)->description )
  97 + return gettext(((LIB3270_ACTION *) accel->arg)->description);
  98 +
  99 + break;
93 100
94 case V3270_ACCELERATOR_TYPE_INTERNAL: 101 case V3270_ACCELERATOR_TYPE_INTERNAL:
95 - return ((V3270_ACTION *) accel->arg)->summary; 102 + if( ((V3270_ACTION *) accel->arg)->summary )
  103 + return ((V3270_ACTION *) accel->arg)->summary;
  104 +
  105 + break;
96 106
97 case V3270_ACCELERATOR_TYPE_LIB3270_TOGGLE: 107 case V3270_ACCELERATOR_TYPE_LIB3270_TOGGLE:
98 - return ((LIB3270_TOGGLE *) accel->arg)->summary; 108 +
  109 + if(((LIB3270_TOGGLE *) accel->arg)->summary)
  110 + return ((LIB3270_TOGGLE *) accel->arg)->summary;
  111 +
  112 + if(((LIB3270_TOGGLE *) accel->arg)->description)
  113 + return ((LIB3270_TOGGLE *) accel->arg)->description;
  114 +
  115 + break;
99 116
100 } 117 }
101 118
102 - return NULL; 119 + return v3270_accelerator_get_name(accel);
103 } 120 }
104 121
105 const gchar * v3270_accelerator_get_name(const V3270Accelerator * accel) 122 const gchar * v3270_accelerator_get_name(const V3270Accelerator * accel)