Make use of g_io_channel_shutdown instead of deprecated g_io_channel_close.

6 files changed, 19 insertions, 20 deletions

diff --git a/audio/avdtp.c b/audio/avdtp.c
index bc021d6c..5c21b95e 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -1832,7 +1832,7 @@ static void avdtp_connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
 
 	if (!g_slist_find(sessions, session)) {
 		debug("avdtp_connect_cb: session got removed");
-		g_io_channel_close(chan);
+		g_io_channel_shutdown(chan, TRUE, NULL);
 		return;
 	}
 
@@ -1996,7 +1996,7 @@ static void avdtp_confirm_cb(GIOChannel *chan, gpointer data)
 	return;
 
 drop:
-	g_io_channel_close(chan);
+	g_io_channel_shutdown(chan, TRUE, NULL);
 }
 
 static int l2cap_connect(struct avdtp *session)
@@ -3181,7 +3181,7 @@ void avdtp_exit(const bdaddr_t *src)
 
 	servers = g_slist_remove(servers, server);
 
-	g_io_channel_close(server->io);
+	g_io_channel_shutdown(server->io, TRUE, NULL);
 	g_io_channel_unref(server->io);
 	g_free(server);
 }
diff --git a/audio/control.c b/audio/control.c
index 0986c015..efe9f987 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -679,7 +679,7 @@ static void avctp_server_cb(GIOChannel *chan, GError *err, gpointer data)
 	if (gerr) {
 		error("%s", gerr->message);
 		g_error_free(gerr);
-		g_io_channel_close(chan);
+		g_io_channel_shutdown(chan, TRUE, NULL);
 		return;
 	}
 
@@ -731,7 +731,7 @@ proceed:
 	return;
 
 drop:
-	g_io_channel_close(chan);
+	g_io_channel_shutdown(chan, TRUE, NULL);
 	avctp_unref(session);
 }
 
@@ -766,7 +766,7 @@ static void avctp_connect_cb(GIOChannel *chan, GError *err, gpointer data)
 
 	if (!session) {
 		debug("avctp_connect_cb: session removed while connecting");
-		g_io_channel_close(chan);
+		g_io_channel_shutdown(chan, TRUE, NULL);
 		g_io_channel_unref(chan);
 		return;
 	}
@@ -785,7 +785,7 @@ static void avctp_connect_cb(GIOChannel *chan, GError *err, gpointer data)
 		avctp_unref(session);
 		error("%s", gerr->message);
 		g_error_free(gerr);
-		g_io_channel_close(chan);
+		g_io_channel_shutdown(chan, TRUE, NULL);
 		return;
 	}
 
@@ -952,7 +952,7 @@ void avrcp_unregister(const bdaddr_t *src)
 	remove_record_from_server(server->ct_record_id);
 	remove_record_from_server(server->tg_record_id);
 
-	g_io_channel_close(server->io);
+	g_io_channel_shutdown(server->io, TRUE, NULL);
 	g_io_channel_unref(server->io);
 	g_free(server);
 
diff --git a/audio/gstavdtpsink.c b/audio/gstavdtpsink.c
index a5ac3bdd..586dfe14 100644
--- a/audio/gstavdtpsink.c
+++ b/audio/gstavdtpsink.c
@@ -144,8 +144,7 @@ static gboolean gst_avdtp_sink_stop(GstBaseSink *basesink)
 	}
 
 	if (self->stream) {
-		g_io_channel_flush(self->stream, NULL);
-		g_io_channel_close(self->stream);
+		g_io_channel_shutdown(self->stream, TRUE, NULL);
 		g_io_channel_unref(self->stream);
 		self->stream = NULL;
 	}
diff --git a/audio/headset.c b/audio/headset.c
index e923fd68..7ed1bb07 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -413,7 +413,7 @@ static void pending_connect_finalize(struct audio_device *dev)
 	g_slist_free(p->callbacks);
 
 	if (p->io) {
-		g_io_channel_close(p->io);
+		g_io_channel_shutdown(p->io, TRUE, NULL);
 		g_io_channel_unref(p->io);
 	}
 
@@ -1130,7 +1130,7 @@ static void close_sco(struct audio_device *device)
 	if (hs->sco) {
 		g_source_remove(hs->sco_id);
 		hs->sco_id = 0;
-		g_io_channel_close(hs->sco);
+		g_io_channel_shutdown(hs->sco, TRUE, NULL);
 		g_io_channel_unref(hs->sco);
 		hs->sco = NULL;
 	}
@@ -2024,12 +2024,12 @@ static void headset_free(struct audio_device *dev)
 	}
 
 	if (hs->sco) {
-		g_io_channel_close(hs->sco);
+		g_io_channel_shutdown(hs->sco, TRUE, NULL);
 		g_io_channel_unref(hs->sco);
 	}
 
 	if (hs->rfcomm) {
-		g_io_channel_close(hs->rfcomm);
+		g_io_channel_shutdown(hs->rfcomm, TRUE, NULL);
 		g_io_channel_unref(hs->rfcomm);
 	}
 
@@ -2341,7 +2341,7 @@ static int headset_close_rfcomm(struct audio_device *dev)
 	GIOChannel *rfcomm = hs->tmp_rfcomm ? hs->tmp_rfcomm : hs->rfcomm;
 
 	if (rfcomm) {
-		g_io_channel_close(rfcomm);
+		g_io_channel_shutdown(rfcomm, TRUE, NULL);
 		g_io_channel_unref(rfcomm);
 		hs->tmp_rfcomm = NULL;
 		hs->rfcomm = NULL;
diff --git a/audio/main.c b/audio/main.c
index 0e5afc42..c3b5bb56 100644
--- a/audio/main.c
+++ b/audio/main.c
@@ -111,7 +111,7 @@ static void sco_server_cb(GIOChannel *chan, GError *err, gpointer data)
 	return;
 
 drop:
-	g_io_channel_close(chan);
+	g_io_channel_shutdown(chan, TRUE, NULL);
 }
 
 static DBusConnection *connection;
@@ -150,7 +150,7 @@ static int audio_init(void)
 static void audio_exit(void)
 {
 	if (sco_server) {
-		g_io_channel_close(sco_server);
+		g_io_channel_shutdown(sco_server, TRUE, NULL);
 		g_io_channel_unref(sco_server);
 		sco_server = NULL;
 	}
diff --git a/audio/manager.c b/audio/manager.c
index d7ecfb40..77de2878 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -501,7 +501,7 @@ static void ag_confirm(GIOChannel *chan, gpointer data)
 	return;
 
 drop:
-	g_io_channel_close(chan);
+	g_io_channel_shutdown(chan, TRUE, NULL);
 }
 
 static void hs_io_cb(GIOChannel *chan, GError *err, void *data)
@@ -592,13 +592,13 @@ failed:
 	error("%s", err->message);
 	g_error_free(err);
 	if (adapter->hsp_ag_server) {
-		g_io_channel_close(adapter->hsp_ag_server);
+		g_io_channel_shutdown(adapter->hsp_ag_server, TRUE, NULL);
 		g_io_channel_unref(adapter->hsp_ag_server);
 		adapter->hsp_ag_server = NULL;
 	}
 
 	if (adapter->hfp_ag_server) {
-		g_io_channel_close(adapter->hfp_ag_server);
+		g_io_channel_shutdown(adapter->hfp_ag_server, TRUE, NULL);
 		g_io_channel_unref(adapter->hfp_ag_server);
 		adapter->hfp_ag_server = NULL;
 	}