diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/105_nxagent_export-remote-keyboard-config.full.patch | 21 |
2 files changed, 23 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index f6d55fbc7..1a09e1679 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low * Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix failures in session windows coming up on Big Endian systems like PPC64. (Fixes: #516). + * Improve 105_nxagent_export-remote-keyboard-config.full.patch. + Don't print out nonsensical information, if there really was + no error when creating the keyboard file or the other way around. + Also add the reason when failing to create the keyboard file. + Only print an error message if SessionPath *really* is not defined. [ Mike Gabriel ] * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch index 2ea3a2c1f..389feaf92 100644 --- a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch +++ b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch @@ -36,7 +36,16 @@ Last-Update: 2011-12-31 #include "NXlib.h" -@@ -1790,6 +1791,42 @@ +@@ -72,6 +73,8 @@ + + #include "Xatom.h" + ++#include <errno.h> ++ + static int nxagentXkbGetNames(char **rules, char **model, char **layout, + char **variant, char **options); + +@@ -1790,6 +1793,48 @@ } #endif @@ -65,11 +74,17 @@ Last-Update: 2011-12-31 + if ( doptions != NULL ) + fprintf(keyboard_file, "options=%s\n", doptions); + fclose(keyboard_file); ++ fprintf(stderr, "keyboard file created\n"); ++ } ++ else { ++ int save_err = errno; ++ fprintf(stderr, "keyboard file not created: %s\n", strerror(save_err)); + } + free(keyboard_file_path); -+ fprintf(stderr, "keyboard file created\n"); + } -+ fprintf(stderr, "SessionPath not defined\n"); ++ else { ++ fprintf(stderr, "SessionPath not defined\n"); ++ } + } + else + { |