diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:07:25 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:07:25 +0200 |
| commit | 9815f32d5c7c397c5a27a53764565beda2d007c2 (patch) | |
| tree | 55ce7e5f2b870f03880358450eebb933cd845d1e /nx-X11/programs/Xserver/hw/nxagent | |
| parent | c3476b6a801ae6355664d5af24ab5a87022c58f6 (diff) | |
| parent | 5dcb19b3d7ae4910f3d3cd1015b0840e7d4bf11d (diff) | |
| download | nx-libs-9815f32d5c7c397c5a27a53764565beda2d007c2.tar.gz nx-libs-9815f32d5c7c397c5a27a53764565beda2d007c2.tar.bz2 nx-libs-9815f32d5c7c397c5a27a53764565beda2d007c2.zip | |
Merge branch 'uli42-pr/dialog_text' into 3.6.x
Attributes GH PR #1004: https://github.com/ArcticaProject/nx-libs/pull/1004
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Dialog.h | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h index b11df5045..d0295f81c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h @@ -192,9 +192,7 @@ by dragging the desktop with the mouse while pressing\n\ Ctrl+Alt or use the keystrokes listed below. Press\n\ %s again to return to the desktop resize mode.\n\ \n\ -Use these keystrokes to navigate:\n\ -%s\ -" +Use these keystrokes to navigate:%s" #define DIALOG_DISABLE_DESKTOP_RESIZE_MODE_TYPE "ok" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 9a7c1cd65..aff2e56ab 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -513,13 +513,13 @@ char *nxagentFindMatchingKeystrokes(char *name) { char *tmp; char *tmp1 = nxagentGetSingleKeystrokeString(cur); - if (-1 == asprintf(&tmp, "%s %-*s : %s\n", res, maxlen, + if (-1 == asprintf(&tmp, "%s\n %-*s : %s", res, maxlen, nxagentSpecialKeystrokeNames[cur->stroke], tmp1)) { SAFE_free(tmp1); #ifdef TEST - fprintf(stderr, "%s: returning incomplete result:\n%s", __func__, res); + fprintf(stderr, "%s: returning incomplete result:%s\n", __func__, res); #endif return res; } |