From 8566230442e5d4d2cbdfdc298bf5fcd8b62e3dd9 Mon Sep 17 00:00:00 2001 From: speidy Date: Sat, 22 Mar 2014 13:36:33 +0200 Subject: [PATCH] sesman: do reconnect to an exisitng Xorg session --- sesman/scp_v0.c | 4 ++-- sesman/session.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c index cf5aa047..9e7d9083 100644 --- a/sesman/scp_v0.c +++ b/sesman/scp_v0.c @@ -130,10 +130,10 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) s->domain, s->program, s->directory, s->client_ip); } - else + else if (SCP_SESSION_TYPE_XORG == s->type) { /* type is SCP_SESSION_TYPE_XORG */ - log_message(LOG_LEVEL_INFO, "starting XOrg session..."); + log_message(LOG_LEVEL_INFO, "starting Xorg session..."); display = session_start(s->width, s->height, s->bpp, s->username, s->password, data, SESMAN_SESSION_TYPE_XORG, s->domain, s->program, s->directory, diff --git a/sesman/session.c b/sesman/session.c index d75ba17b..24d8da50 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -108,6 +108,9 @@ session_get_bydata(char *name, int width, int height, int bpp, int type) case SCP_SESSION_TYPE_XRDP: /* 1 */ type = SESMAN_SESSION_TYPE_XRDP; /* 1 */ break; + case SCP_SESSION_TYPE_XORG: + type = SESMAN_SESSION_TYPE_XORG; + break; default: lock_chain_release(); return 0;