Commit afcc7a93 authored by Mihai Moldovan's avatar Mihai Moldovan Committed by Mike Gabriel

Improve 105_nxagent_export-remote-keyboard-config.full.patch. Don't print out…

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.
parent cfb1990d
...@@ -6,6 +6,11 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low ...@@ -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 * Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix
failures in session windows coming up on Big Endian systems failures in session windows coming up on Big Endian systems
like PPC64. (Fixes: #516). 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 ] [ Mike Gabriel ]
* Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64
......
...@@ -36,7 +36,16 @@ Last-Update: 2011-12-31 ...@@ -36,7 +36,16 @@ Last-Update: 2011-12-31
#include "NXlib.h" #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 #endif
...@@ -65,12 +74,18 @@ Last-Update: 2011-12-31 ...@@ -65,12 +74,18 @@ Last-Update: 2011-12-31
+ if ( doptions != NULL ) + if ( doptions != NULL )
+ fprintf(keyboard_file, "options=%s\n", doptions); + fprintf(keyboard_file, "options=%s\n", doptions);
+ fclose(keyboard_file); + 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); + free(keyboard_file_path);
+ fprintf(stderr, "keyboard file created\n");
+ } + }
+ else {
+ fprintf(stderr, "SessionPath not defined\n"); + fprintf(stderr, "SessionPath not defined\n");
+ } + }
+ }
+ else + else
+ { + {
+ fprintf(stderr, "Failed to create the keyboard file\n"); + fprintf(stderr, "Failed to create the keyboard file\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment