[Pkg-telepathy-commits] [telepathy-idle] 06/26: ServerConnection: dispose internal objects

[Simon McVittie]

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

smcv pushed a commit to branch debian
in repository telepathy-idle.

commit 983603a6db3b01e4a7d117ee35d20b60c0c896a4
Author: Lionel Landwerlin <llandwerlin at gmail.com>
Date:   Thu Aug 29 23:48:36 2013 +0100

    ServerConnection: dispose internal objects
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64923
    Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
---
 src/idle-server-connection.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/idle-server-connection.c b/src/idle-server-connection.c
index a921c33..66fe3d0 100644
--- a/src/idle-server-connection.c
+++ b/src/idle-server-connection.c
@@ -107,10 +107,10 @@ static void idle_server_connection_dispose(GObject *obj) {
 	IdleServerConnection *conn = IDLE_SERVER_CONNECTION(obj);
 	IdleServerConnectionPrivate *priv = IDLE_SERVER_CONNECTION_GET_PRIVATE(conn);
 
-	if (priv->socket_client != NULL) {
-		g_object_unref(priv->socket_client);
-		priv->socket_client = NULL;
-	}
+        g_clear_object (&priv->socket_client);
+        g_clear_object (&priv->io_stream);
+        g_clear_object (&priv->tls_manager);
+        g_clear_object (&priv->read_cancellable);
 }
 
 static void idle_server_connection_finalize(GObject *obj) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-idle.git