I repeat my request to keep patches minimal and let them only fix one issue: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=3b20e0e71cf3c01b...
The copyright header layout fixes I have committed separately. http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=93d11591928f54ff...
OK. I'll keep that in mind, thanks. :)
The DISPLAY var detection is another commit: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=f9f9efef4450485b...
To my mind, it was part of the UNIX socket display rewrite. You really can NOT just split the changes to those two files, as they depend on each other. (At least the first depends on the second one.)