[X2Go-Commits] [x2gokdrive] 02/04: Make that initialization only happen on startup (i.e. when serverGeneration == 1).
git-admin at x2go.org
git-admin at x2go.org
Fri Jul 12 20:56:01 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit d5e27fa09156f7abce4db8b857f7fd53075ed94b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jul 12 19:21:25 2019 +0200
Make that initialization only happen on startup (i.e. when serverGeneration == 1).
This relates to X.Org commit:
commit 0848390d51f93ecfb9342cffe1cda46a65cfc07b
Author: Adam Jackson <ajax at redhat.com>
Date: Wed May 10 11:14:57 2017 -0400
xephyr: Fix regeneration
I had said:
commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Mar 24 15:58:54 2017 -0400
kdrive: Remove KdOsFuncs
Only the Init slot was used, and Xephyr can just as easily do
that initialization directly.
And I'd've been right, but I forgot to make that initialization only
happen on startup (i.e. when serverGeneration == 1).
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
The above referenced X.Org commit had earlier been backported to
x2gokdrive:
commit d2434d7c3d9d70c5fc002699a77471cb7c42f71a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jun 13 16:33:01 2019 +0200
kdrive: Remove KdOsFuncs (X.org backport)
Backported from X.org:
commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Mar 24 15:58:54 2017 -0400
kdrive: Remove KdOsFuncs
Only the Init slot was used, and Xephyr can just as easily do that
initialization directly.
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---
x2gokdriveinit.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index e88f194..a73ffe1 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -235,10 +235,12 @@ OsVendorInit(void)
// if (hostx_want_host_cursor())
ephyrFuncs.initCursor = &ephyrCursorInit;
- if (!KdCardInfoLast()) {
- processScreenArg("800x600", NULL);
+ if (serverGeneration == 1) {
+ if (!KdCardInfoLast()) {
+ processScreenArg("800x600", NULL);
+ }
+ remote_init();
}
- remote_init();
}
KdCardFuncs ephyrFuncs = {
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
More information about the x2go-commits
mailing list