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.

1 files changed, 18 insertions, 3 deletions

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
 +  {