This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository libx2goclient. from 1a2ac19 src/x2goclient-network.c: check object type for parse_sockspec(). new 50b2d4e src/x2goclient-network.h: let connect public method take a self parameter. new 3f6a96b src/x2goclient-network.{c,h}: implement x2goclient_network_connect () as a wrapper. new 3f4bb65 src/x2goclient-network-ssh.{c,h}: implement stub x2goclient_network_ssh_connect () and assign to public connect () method of parent class. new 399228d src/test/sshtest.c: try to call connect () method of an X2GoClientNetworkSSH object, but fail so far. The 4 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: src/test/sshtest.c | 16 +++++++++++++--- src/x2goclient-network-ssh.c | 12 ++++++++++++ src/x2goclient-network-ssh.h | 2 ++ src/x2goclient-network.c | 6 ++++++ src/x2goclient-network.h | 4 +++- 5 files changed, 36 insertions(+), 4 deletions(-) -- 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 50b2d4ebf07ff00084adc78faf888c0c5648266b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 3 13:11:43 2019 +0200 src/x2goclient-network.h: let connect public method take a self parameter. --- src/x2goclient-network.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h index 23156ff..4768e1b 100644 --- a/src/x2goclient-network.h +++ b/src/x2goclient-network.h @@ -55,7 +55,7 @@ G_DECLARE_DERIVABLE_TYPE (X2GoClientNetwork, x2goclient_network, X2GOCLIENT, NET struct _X2GoClientNetworkClass { GObjectClass parent_class; - gboolean (*connect) (void); + gboolean (*connect) (X2GoClientNetwork *self); /*< private >*/ GSocketAddress* (*parse_sockspec) (X2GoClientNetwork *self, const GString *sockspec); -- 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 3f6a96b45b783f3cc192ef13e8d170eb93edce97 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 3 13:12:42 2019 +0200 src/x2goclient-network.{c,h}: implement x2goclient_network_connect () as a wrapper. --- src/x2goclient-network.c | 6 ++++++ src/x2goclient-network.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c index 3cac5b9..f88e06e 100644 --- a/src/x2goclient-network.c +++ b/src/x2goclient-network.c @@ -78,6 +78,12 @@ static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *sel return X2GOCLIENT_NETWORK_GET_CLASS (self)->parse_sockspec (self, sockspec); } +gboolean x2goclient_network_connect (X2GoClientNetwork *self) { + g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (self), FALSE); + + return X2GOCLIENT_NETWORK_GET_CLASS (self)->connect (self); +} + static void x2goclient_network_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *param_spec) { X2GoClientNetwork *self = X2GOCLIENT_NETWORK (object); X2GoClientNetworkPrivate *priv = x2goclient_network_get_instance_private (self); diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h index 4768e1b..9553fc4 100644 --- a/src/x2goclient-network.h +++ b/src/x2goclient-network.h @@ -64,6 +64,8 @@ struct _X2GoClientNetworkClass { gpointer padding[50]; }; +gboolean x2goclient_network_connect (X2GoClientNetwork *self); + 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 3f4bb659765ba7a0a4c69035ac3ed28354207707 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 3 13:14:08 2019 +0200 src/x2goclient-network-ssh.{c,h}: implement stub x2goclient_network_ssh_connect () and assign to public connect () method of parent class. --- src/x2goclient-network-ssh.c | 12 ++++++++++++ src/x2goclient-network-ssh.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 938f88e..a68263b 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -497,7 +497,19 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetworkS return ret; } +gboolean x2goclient_network_ssh_connect (X2GoClientNetwork *parent) { + gboolean ret = FALSE; + + g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (parent), ret); + X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (parent); + + return (ret); +} + static void x2goclient_network_ssh_class_init (X2GoClientNetworkSSHClass *klass) { + X2GoClientNetworkClass *parent_class = X2GOCLIENT_NETWORK_CLASS (klass); + + parent_class->connect = &x2goclient_network_ssh_connect; } static void x2goclient_network_ssh_init (X2GoClientNetworkSSH *self) { diff --git a/src/x2goclient-network-ssh.h b/src/x2goclient-network-ssh.h index b3aec02..2dedd31 100644 --- a/src/x2goclient-network-ssh.h +++ b/src/x2goclient-network-ssh.h @@ -41,6 +41,8 @@ G_DECLARE_FINAL_TYPE (X2GoClientNetworkSSH, x2goclient_network_ssh, X2GOCLIENT, X2GoClientNetworkSSH* x2goclient_network_ssh_new (void); +gboolean x2goclient_network_ssh_connect (X2GoClientNetwork *parent); + 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 399228d65287e4b56b13ef414f09b06ef2d94876 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 3 13:16:13 2019 +0200 src/test/sshtest.c: try to call connect () method of an X2GoClientNetworkSSH object, but fail so far. There just seems to be no way to do this correctly. We'll always get a compiler warning because of mismatching pointers - either when assigning a function pointer to the parent class's connect () method or when calling x2goclient_network_ssh_connect (). So far I have no idea how you're supposed to do something like this with glib/GObject. There's also no code in glib itself that would use such a feature. --- src/test/sshtest.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/test/sshtest.c b/src/test/sshtest.c index 7c676b5..e429fc2 100644 --- a/src/test/sshtest.c +++ b/src/test/sshtest.c @@ -28,6 +28,7 @@ #include <libintl.h> #include <glib.h> +#include <glib/gprintf.h> #include <glib/gi18n.h> #include <gio/gio.h> @@ -41,19 +42,28 @@ #define _(String) gettext (String) int main (int argc, char **argv) { + int ret = EXIT_FAILURE; + setlocale (LC_MESSAGES, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - printf (_("SSH testing utility for %s version %s\n\n"), _(PACKAGE_NAME), _(PACKAGE_VERSION)); + g_printf (_("SSH testing utility for %s version %s\n\n"), _(PACKAGE_NAME), _(PACKAGE_VERSION)); GString *ssh_uri = NULL; if (argc != 1) { - fprintf (stderr, _("Error. Program needs exactly one argument: an SSH location specifier.\n")); + g_fprintf (stderr, _("Error. Program needs exactly one argument: an SSH location specifier.\n")); } else { ssh_uri = g_string_new (argv[1]); } - return (EXIT_SUCCESS); + X2GoClientNetworkSSH *net_ssh = x2goclient_network_ssh_new (); + g_object_set (G_OBJECT (net_ssh), "socket", ssh_uri, NULL); + + g_printf ("Trying to connect...\n"); + gboolean conn_ret = x2goclient_network_ssh_connect (net_ssh); + g_printf ("Connection status: %s.\n", (conn_ret) ? "true" : "false"); + + return (ret); } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
-
git-admin＠x2go.org