[X2Go-Commits] [nx-libs] 278/429: nxagent: fix RESIZE dialog text to not end with a linefeed

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 5dcb19b3d7ae4910f3d3cd1015b0840e7d4bf11d
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Feb 28 21:50:48 2021 +0100

    nxagent: fix RESIZE dialog text to not end with a linefeed
    
    It was the only dialog that had a linefeed a the end.
---
 nx-X11/programs/Xserver/hw/nxagent/Dialog.h    | 4 +---
 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;
       }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git