[X2Go-Commits] [libx2goclient] 06/13: src/x2goclient-network-ssh.c: also use g_boxed_free ().

git-admin at x2go.org git-admin at x2go.org
Sat Jun 27 14:42:21 CEST 2020


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

x2go pushed a commit to branch master
in repository libx2goclient.

commit 5127e56189e251c07dd81a2472cb92588226a2bb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jun 26 12:42:34 2020 +0200

    src/x2goclient-network-ssh.c: also use g_boxed_free ().
    
    Same reasoning.
---
 src/x2goclient-network-ssh.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c
index c87e433..80d523f 100644
--- a/src/x2goclient-network-ssh.c
+++ b/src/x2goclient-network-ssh.c
@@ -207,11 +207,15 @@ static void x2goclient_network_ssh_finalize (GObject *object) {
   X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (object);
 
   /* Properties. */
-  x2goclient_openssh_version_free (self->openssh_version);
-  self->openssh_version = NULL;
+  if (self->openssh_version) {
+    g_boxed_free (X2GOCLIENT_TYPE_OPENSSH_VERSION, self->openssh_version);
+    self->openssh_version = NULL;
+  }
 
-  x2goclient_openssh_bugs_free (self->openssh_bugs);
-  self->openssh_bugs = NULL;
+  if (self->openssh_bugs) {
+    g_boxed_free (X2GOCLIENT_TYPE_OPENSSH_BUGS, self->openssh_bugs);
+    self->openssh_bugs = NULL;
+  }
 
 
   g_free (self->control_path);
@@ -230,11 +234,17 @@ static void x2goclient_network_ssh_set_property (GObject *object, guint prop_id,
 
   switch (prop_id) {
     case (X2GO_NET_SSH_PROP_OPENSSH_VERSION):
-                                              x2goclient_openssh_version_free (self->openssh_version);
+                                              if (self->openssh_version) {
+                                                g_boxed_free (X2GOCLIENT_TYPE_OPENSSH_VERSION,
+                                                              self->openssh_version);
+                                              }
                                               self->openssh_version = g_value_dup_boxed (value);
                                               break;
     case (X2GO_NET_SSH_PROP_OPENSSH_BUGS):
-                                           x2goclient_openssh_bugs_free (self->openssh_bugs);
+                                           if (self->openssh_bugs) {
+                                             g_boxed_free (X2GOCLIENT_TYPE_OPENSSH_BUGS,
+                                                           self->openssh_bugs);
+                                           }
                                            self->openssh_bugs = g_value_dup_boxed (value);
                                            break;
     default:

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


More information about the x2go-commits mailing list