From 3c80e3c23ad3f99b9766cccc49a9b4537abde10b Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 6 Sep 2014 12:55:27 -0700
Subject: rtmpclient: don't store socket_client

---
 rtmp/rtmpclient.c | 12 +++++++-----
 rtmp/rtmpclient.h |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rtmp/rtmpclient.c b/rtmp/rtmpclient.c
index 96cb94e..0ef8c3b 100644
--- a/rtmp/rtmpclient.c
+++ b/rtmp/rtmpclient.c
@@ -175,7 +175,6 @@ gst_rtmp_client_finalize (GObject * object)
   g_free (rtmpclient->server_address);
   g_free (rtmpclient->stream);
   g_object_unref (rtmpclient->connection);
-  g_object_unref (rtmpclient->socket_client);
 
   G_OBJECT_CLASS (gst_rtmp_client_parent_class)->finalize (object);
 }
@@ -216,6 +215,7 @@ gst_rtmp_client_connect_async (GstRtmpClient * client,
     GCancellable * cancellable, GAsyncReadyCallback callback,
     gpointer user_data)
 {
+  GSocketClient *socket_client;
   GSimpleAsyncResult *async;
   GSocketConnectable *addr;
 
@@ -234,11 +234,11 @@ gst_rtmp_client_connect_async (GstRtmpClient * client,
   client->async = async;
 
   addr = g_network_address_new (client->server_address, client->server_port);
-  client->socket_client = g_socket_client_new ();
-  g_socket_client_set_timeout (client->socket_client, client->timeout);
+  socket_client = g_socket_client_new ();
+  g_socket_client_set_timeout (socket_client, client->timeout);
 
   GST_DEBUG ("g_socket_client_connect_async");
-  g_socket_client_connect_async (client->socket_client, addr,
+  g_socket_client_connect_async (socket_client, addr,
       client->cancellable, gst_rtmp_client_connect_done, client);
   g_object_unref (addr);
 }
@@ -247,12 +247,14 @@ static void
 gst_rtmp_client_connect_done (GObject * source, GAsyncResult * result,
     gpointer user_data)
 {
+  GSocketClient *socket_client = G_SOCKET_CLIENT (source);
   GstRtmpClient *client = GST_RTMP_CLIENT (user_data);
   GError *error = NULL;
 
   GST_DEBUG ("g_socket_client_connect_done");
   client->socket_connection =
-      g_socket_client_connect_finish (client->socket_client, result, &error);
+      g_socket_client_connect_finish (socket_client, result, &error);
+  g_object_unref (socket_client);
   if (client->socket_connection == NULL) {
     GST_ERROR ("error");
     g_simple_async_result_set_error (client->async, GST_RTMP_ERROR,
diff --git a/rtmp/rtmpclient.h b/rtmp/rtmpclient.h
index 4b3e15f..1204f2b 100644
--- a/rtmp/rtmpclient.h
+++ b/rtmp/rtmpclient.h
@@ -71,7 +71,6 @@ struct _GstRtmpClient
 
   GCancellable *cancellable;
   GSimpleAsyncResult *async;
-  GSocketClient *socket_client;
   GSocketConnection *socket_connection;
 
   GstRtmpConnection *connection;
-- 
cgit v1.2.3