[X2Go-Commits] [libx2goclient] 02/44: src/x2goclient-network-ssh.c: add active_master_conn instance variable, scheduled to replace master_conn.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository libx2goclient.

commit f8c71aaa1e14f8d8d10d262d1596d70740459da3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jul 29 10:59:26 2020 +0200

    src/x2goclient-network-ssh.c: add active_master_conn instance variable, scheduled to replace master_conn.
---
 src/x2goclient-network-ssh.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c
index 010810d..472f7db 100644
--- a/src/x2goclient-network-ssh.c
+++ b/src/x2goclient-network-ssh.c
@@ -104,6 +104,7 @@ struct _X2GoClientNetworkSSH {
 
   char *control_path;
   GSubprocess *master_conn;
+  gboolean active_master_conn;
 };
 
 G_DEFINE_TYPE (X2GoClientNetworkSSH, x2goclient_network_ssh, X2GOCLIENT_TYPE_NETWORK);
@@ -171,6 +172,7 @@ static void x2goclient_network_ssh_init (X2GoClientNetworkSSH *self) {
 
   self->control_path = NULL;
   self->master_conn = NULL;
+  self->active_master_conn = NULL;
 }
 
 X2GoClientNetworkSSH* x2goclient_network_ssh_new (const char * const session_path) {
@@ -692,7 +694,9 @@ static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH *
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret);
 
-  if (self->master_conn) {
+  if (self->active_master_conn) {
+    /* FIXME: rework this code! */
+
     /* Cleanup, if necessary. */
     g_log (NULL, G_LOG_LEVEL_DEBUG, "Master connection cleanup required.");
 
@@ -722,6 +726,7 @@ static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH *
 
     g_object_unref (self->master_conn);
     self->master_conn = NULL;
+    self->active_master_conn = FALSE;
 
     ret = TRUE;
   }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git