diff options
| author | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-02-19 15:58:15 -0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-02-19 16:23:10 -0300 |
| commit | 10d6858927cb3db0a06c42f41cdb5f3175082df3 (patch) | |
| tree | 84b4164449b747d56c0d4b86b205f80744162fc5 /audio/headset.c | |
| parent | e777c55aa7cd84fe63bcdee16acde8d1a293b928 (diff) | |
Make use of g_io_channel_shutdown instead of deprecated g_io_channel_close.
Diffstat (limited to 'audio/headset.c')
| -rw-r--r-- | audio/headset.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |