This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository libx2goclient. from e8e0045 .gitignore: update with more build cruft. new 14ecc65 src/x2goclient-object.h: forgot include guard change. new 10a0c2b src/x2goclient-object.c: not a header, so drop the include guards. new 8d8ada1 src/: add new x2goclient-network skeleton. new d9e44ce src/Makefile.am: reference x2goclient-network. new 8649100 po/POTFILES.in: reference x2goclient-network. new 9385bf1 src/x2goclient-network.{h,c}: implement basic abstract network object classes. new 1b59100 src/: add x2goclient-network-ssh.{c,h} stubs. new 8910860 src/Makefile.am: reference x2goclient-network-ssh. new 48b5bb7 po/POTFILES.in: reference x2goclient-network-ssh. new 36728ad src/x2goclient-network-ssh.{c,h}: implement stub classes. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/POTFILES.in | 2 + src/Makefile.am | 4 + ...2goclient-object.c => x2goclient-network-ssh.c} | 33 ++++++-- ...2goclient-object.h => x2goclient-network-ssh.h} | 22 ++++- src/x2goclient-network.c | 93 ++++++++++++++++++++++ src/{x2goclient-object.h => x2goclient-network.h} | 24 +++++- src/x2goclient-object.c | 5 -- src/x2goclient-object.h | 6 +- 8 files changed, 167 insertions(+), 22 deletions(-) copy src/{x2goclient-object.c => x2goclient-network-ssh.c} (57%) copy src/{x2goclient-object.h => x2goclient-network-ssh.h} (56%) create mode 100644 src/x2goclient-network.c copy src/{x2goclient-object.h => x2goclient-network.h} (59%) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 864910083bb893c895d01221a55c02b7876999e8 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 08:46:22 2019 +0200 po/POTFILES.in: reference x2goclient-network. --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3642fde..1fcc3dd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ src/x2goclient-agent-start-kdrive.c src/x2goclient-agent-start-nx.c +src/x2goclient-network.c src/x2goclient-proxy-start-nx.c src/x2goclient-object.c src/x2goclient-renderer-start-kdrive.c -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 10a0c2b2d0b6df85adfe59d08ec21e6285d7ec3f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 08:41:40 2019 +0200 src/x2goclient-object.c: not a header, so drop the include guards. --- src/x2goclient-object.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/x2goclient-object.c b/src/x2goclient-object.c index 4c5f8da..ce538b4 100644 --- a/src/x2goclient-object.c +++ b/src/x2goclient-object.c @@ -22,9 +22,6 @@ Boston, MA 02110-1301, USA. */ -#ifndef x2goclient_object_h -#define x2goclient_object_h - #include <glib.h> #include <glib/gi18n.h> @@ -34,5 +31,3 @@ #include "x2goclient.h" #include "x2goclient-object.h" - -#endif /* x2goclient_object_h */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit d9e44ce6c3874d7e9a3dc1f849939e5262d95e76 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 08:46:10 2019 +0200 src/Makefile.am: reference x2goclient-network. --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index d3d4dac..23e4249 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ libx2goclientinclude_HEADERS = \ x2goclient-agent-start-kdrive.h \ x2goclient-agent-start-nx.h \ x2goclient.h \ + x2goclient-network.h \ x2goclient-proxy-start-nx.h \ x2goclient-renderer-start-kdrive.h \ x2goclient-object.h \ @@ -24,6 +25,7 @@ libx2goclientinclude_HEADERS = \ libx2goclient_la_SOURCES = \ x2goclient-agent-start-kdrive.c \ x2goclient-agent-start-nx.c \ + x2goclient-network.c \ x2goclient-proxy-start-nx.c \ x2goclient-renderer-start-kdrive.c \ x2goclient-object.c \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 8d8ada1d4f2e18234c06d4df57ebad0a6e1d5271 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 08:45:54 2019 +0200 src/: add new x2goclient-network skeleton. --- src/x2goclient-network.c | 33 +++++++++++++++++++++++++++++++++ src/x2goclient-network.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c new file mode 100644 index 0000000..dce782f --- /dev/null +++ b/src/x2goclient-network.c @@ -0,0 +1,33 @@ +/* -*- Mode: C; c-set-style: linux indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ + +/* x2goclient-network.c - X2Go Client high-level network handling + + Copyright (C) 2019 Mike Gabriel + Copyright (C) 2019 Mihai Moldovan + All rights reserved. + + The libx2goclient library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The libx2goclient library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the Mate Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +#include <glib.h> +#include <glib/gi18n.h> + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "x2goclient.h" +#include "x2goclient-network.h" diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h new file mode 100644 index 0000000..4f64309 --- /dev/null +++ b/src/x2goclient-network.h @@ -0,0 +1,32 @@ +/* -*- Mode: C; c-set-style: linux indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ + +/* x2goclient-network.h - X2Go Client high-level network handling + + Copyright (C) 2019 Mike Gabriel + Copyright (C) 2019 Mihai Moldovan + All rights reserved. + + The libx2goclient library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The libx2goclient library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the Mate Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +#ifndef x2goclient_network_h +#define x2goclient_network_h + +G_BEGIN_DECLS + +G_END_DECLS + +#endif /* x2goclient_network_h */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 14ecc652fa02815bbc746fc53379b3a6004ec711 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 08:34:45 2019 +0200 src/x2goclient-object.h: forgot include guard change. --- src/x2goclient-object.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/x2goclient-object.h b/src/x2goclient-object.h index 46e751e..2c3db7a 100644 --- a/src/x2goclient-object.h +++ b/src/x2goclient-object.h @@ -22,11 +22,11 @@ Boston, MA 02110-1301, USA. */ -#ifndef X2GOCLIENT_OBJECT_H -#define X2GOCLIENT_OBJECT_H +#ifndef x2goclient_object_h +#define x2goclient_object_h G_BEGIN_DECLS G_END_DECLS -#endif /* X2GOCLIENT_OBJECT_H */ +#endif /* x2goclient_object_h */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 36728ad10a0a95214037b0aab1d184a9e52d4856 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 13:27:25 2019 +0200 src/x2goclient-network-ssh.{c,h}: implement stub classes. --- src/x2goclient-network-ssh.c | 24 ++++++++++++++++++++++++ src/x2goclient-network-ssh.h | 12 ++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index c5fc48b..133b112 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -33,3 +33,27 @@ #include "x2goclient.h" #include "x2goclient-network-ssh.h" +struct _X2GoClientNetworkOptionsSSH { + X2GoClientNetworkOptions parent_class; +}; + +G_DEFINE_TYPE (X2GoClientNetworkOptionsSSH, x2goclient_network_options_ssh, X2GOCLIENT_TYPE_NETWORK_OPTIONS); + +static void x2goclient_network_options_ssh_class_init (X2GoClientNetworkOptionsSSHClass *klass) { +} + +static void x2goclient_network_options_ssh_init (X2GoClientNetworkOptionsSSH *self) { +} + + +struct _X2GoClientNetworkSSH { + X2GoClientNetwork parent_class; +}; + +G_DEFINE_TYPE (X2GoClientNetworkSSH, x2goclient_network_ssh, X2GOCLIENT_TYPE_NETWORK); + +static void x2goclient_network_ssh_class_init (X2GoClientNetworkSSHClass *klass) { +} + +static void x2goclient_network_ssh_init (X2GoClientNetworkSSH *self) { +} diff --git a/src/x2goclient-network-ssh.h b/src/x2goclient-network-ssh.h index 53056e5..b3aec02 100644 --- a/src/x2goclient-network-ssh.h +++ b/src/x2goclient-network-ssh.h @@ -25,10 +25,22 @@ #ifndef x2goclient_network_ssh_h #define x2goclient_network_ssh_h +#include <glib-object.h> + #include "x2goclient-network.h" G_BEGIN_DECLS +#define X2GOCLIENT_TYPE_NETWORK_OPTIONS_SSH (x2goclient_network_options_ssh_get_type ()) +G_DECLARE_FINAL_TYPE (X2GoClientNetworkOptionsSSH, x2goclient_network_options_ssh, X2GOCLIENT, NETWORK_OPTIONS_SSH, X2GoClientNetworkOptions) + +X2GoClientNetworkOptionsSSH* x2goclient_network_options_ssh_new (void); + +#define X2GOCLIENT_TYPE_NETWORK_SSH (x2goclient_network_ssh_get_type ()) +G_DECLARE_FINAL_TYPE (X2GoClientNetworkSSH, x2goclient_network_ssh, X2GOCLIENT, NETWORK_SSH, X2GoClientNetwork) + +X2GoClientNetworkSSH* x2goclient_network_ssh_new (void); + G_END_DECLS #endif /* x2goclient_network_ssh_h */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 9385bf141f86ef45a1c9355f1c371127ec06665c Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 12:37:39 2019 +0200 src/x2goclient-network.{h,c}: implement basic abstract network object classes. G-IR spits multiple warnings because of the mismatching namespace, but I wasn't able to find out what this is referring to. --- src/x2goclient-network.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ src/x2goclient-network.h | 16 +++++++++++++ 2 files changed, 76 insertions(+) diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c index dce782f..2c46092 100644 --- a/src/x2goclient-network.c +++ b/src/x2goclient-network.c @@ -24,6 +24,7 @@ #include <glib.h> #include <glib/gi18n.h> +#include <gio/gio.h> #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,3 +32,62 @@ #include "x2goclient.h" #include "x2goclient-network.h" + +/* Not sure if we need this, so comment out for now. */ +/* +typedef struct X2GoClientNetworkOptionsPrivate_ { +} X2GoClientNetworkOptionsPrivate; +*/ + +/* G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (X2GoClientNetworkOptions, x2goclient_network_options, G_TYPE_OBJECT); */ +G_DEFINE_ABSTRACT_TYPE (X2GoClientNetworkOptions, x2goclient_network_options, G_TYPE_OBJECT); + +static void x2goclient_network_options_class_init (X2GoClientNetworkOptionsClass *klass) { +} + +static void x2goclient_network_options_init (X2GoClientNetworkOptions *self) { +} + + +/* +typedef struct X2GoClientNetworkPrivate_ { +} X2GoClientNetworkPrivate; +*/ + +/* G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (X2GoClientNetwork, x2goclient_network, G_TYPE_OBJECT); */ +G_DEFINE_ABSTRACT_TYPE (X2GoClientNetwork, x2goclient_network, G_TYPE_OBJECT); + +/* + * Caution: NEVER abbreviate names in public (API) space. + * + * Since this file is a private implementation and nothing, short of + * extern variables, structs, functions, ... that come via headers, + * is actually exported, we can go bonkers with abbreviations. + */ +enum { + X2GO_NET_PROP_SOCKET = 1, + X2GO_NET_PROP_OPTIONS, + X2GO_NET_N_PROPERTIES +}; + +static GParamSpec *net_obj_properties[X2GO_NET_N_PROPERTIES] = { NULL, }; + +static void x2goclient_network_class_init (X2GoClientNetworkClass *klass) { + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + net_obj_properties[X2GO_NET_PROP_SOCKET] = g_param_spec_object ("socket", "Low-level socket", + "Low-level socket for the network connection, the local " + "part will be used for local binding if specified.", + G_TYPE_SOCKET_ADDRESS, + G_PARAM_READWRITE); + + net_obj_properties[X2GO_NET_PROP_OPTIONS] = g_param_spec_object ("options", "Socket options", + "Specific socket options.", + X2GOCLIENT_TYPE_NETWORK_OPTIONS, + G_PARAM_READWRITE); + + g_object_class_install_properties (object_class, X2GO_NET_N_PROPERTIES, net_obj_properties); +} + +static void x2goclient_network_init (X2GoClientNetwork *self) { +} diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h index 4f64309..998221a 100644 --- a/src/x2goclient-network.h +++ b/src/x2goclient-network.h @@ -25,8 +25,24 @@ #ifndef x2goclient_network_h #define x2goclient_network_h +#include <glib-object.h> + G_BEGIN_DECLS +#define X2GOCLIENT_TYPE_NETWORK_OPTIONS (x2goclient_network_options_get_type ()) +G_DECLARE_DERIVABLE_TYPE (X2GoClientNetworkOptions, x2goclient_network_options, X2GOCLIENT, NETWORK_OPTIONS, GObject) + +struct _X2GoClientNetworkOptionsClass { + GObjectClass parent_class; +}; + +#define X2GOCLIENT_TYPE_NETWORK (x2goclient_network_get_type ()) +G_DECLARE_DERIVABLE_TYPE (X2GoClientNetwork, x2goclient_network, X2GOCLIENT, NETWORK, GObject) + +struct _X2GoClientNetworkClass { + GObjectClass parent_class; +}; + G_END_DECLS #endif /* x2goclient_network_h */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 1b5910053b7b4fd465f428cf7808ad4fa5ac29cf Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 12:42:53 2019 +0200 src/: add x2goclient-network-ssh.{c,h} stubs. --- src/x2goclient-network-ssh.c | 35 +++++++++++++++++++++++++++++++++++ src/x2goclient-network-ssh.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c new file mode 100644 index 0000000..c5fc48b --- /dev/null +++ b/src/x2goclient-network-ssh.c @@ -0,0 +1,35 @@ +/* -*- Mode: C; c-set-style: linux indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ + +/* x2goclient-network.c - X2Go Client SSH network handling + + Copyright (C) 2019 Mike Gabriel + Copyright (C) 2019 Mihai Moldovan + All rights reserved. + + The libx2goclient library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The libx2goclient library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the Mate Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +#include <glib.h> +#include <glib/gi18n.h> +#include <gio/gio.h> + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "x2goclient.h" +#include "x2goclient-network-ssh.h" + diff --git a/src/x2goclient-network-ssh.h b/src/x2goclient-network-ssh.h new file mode 100644 index 0000000..53056e5 --- /dev/null +++ b/src/x2goclient-network-ssh.h @@ -0,0 +1,34 @@ +/* -*- Mode: C; c-set-style: linux indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ + +/* x2goclient-network-ssh.h - X2Go Client SSH network handling + + Copyright (C) 2019 Mike Gabriel + Copyright (C) 2019 Mihai Moldovan + All rights reserved. + + The libx2goclient library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The libx2goclient library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the Mate Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +#ifndef x2goclient_network_ssh_h +#define x2goclient_network_ssh_h + +#include "x2goclient-network.h" + +G_BEGIN_DECLS + +G_END_DECLS + +#endif /* x2goclient_network_ssh_h */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 8910860f559d24477497e45cd80dbfc440473bc6 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 12:45:03 2019 +0200 src/Makefile.am: reference x2goclient-network-ssh. --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 23e4249..494794d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,7 @@ libx2goclientinclude_HEADERS = \ x2goclient-agent-start-nx.h \ x2goclient.h \ x2goclient-network.h \ + x2goclient-network-ssh.h \ x2goclient-proxy-start-nx.h \ x2goclient-renderer-start-kdrive.h \ x2goclient-object.h \ @@ -26,6 +27,7 @@ libx2goclient_la_SOURCES = \ x2goclient-agent-start-kdrive.c \ x2goclient-agent-start-nx.c \ x2goclient-network.c \ + x2goclient-network-ssh.c \ x2goclient-proxy-start-nx.c \ x2goclient-renderer-start-kdrive.c \ x2goclient-object.c \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 48b5bb7edf928f29cbc23a2e413a138b75b9bb8f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 15 12:45:34 2019 +0200 po/POTFILES.in: reference x2goclient-network-ssh. --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1fcc3dd..1d1e55a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,7 @@ src/x2goclient-agent-start-kdrive.c src/x2goclient-agent-start-nx.c src/x2goclient-network.c +src/x2goclient-network-ssh.c src/x2goclient-proxy-start-nx.c src/x2goclient-object.c src/x2goclient-renderer-start-kdrive.c -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git