diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-24 15:22:38 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-24 15:22:38 +0200 |
| commit | d8dc7222635023720f7aeb4e9a14a678ca2d5344 (patch) | |
| tree | 906bbeedbb4873cf019d548e355df0a316034ff1 | |
| parent | 8c238530c22a1e96f4ffa7a87141ace4dc6c9b48 (diff) | |
Start monitoring the AVCTP channel first in connect_cb
| -rw-r--r-- | audio/control.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/audio/control.c b/audio/control.c index 74879656..5be51fe7 100644 --- a/audio/control.c +++ b/audio/control.c @@ -431,6 +431,7 @@ static void avctp_unref(struct avctp *session) g_io_channel_shutdown(session->io, TRUE, NULL); g_io_channel_unref(session->io); } + if (session->io_id) g_source_remove(session->io_id); @@ -686,7 +687,6 @@ static void auth_cb(DBusError *derr, void *user_data) static void avctp_confirm_cb(GIOChannel *chan, gpointer data) { struct avctp *session; - GIOCondition flags = G_IO_ERR | G_IO_HUP | G_IO_NVAL; struct audio_device *dev; char address[18]; bdaddr_t src, dst; @@ -737,9 +737,6 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data) session->state = AVCTP_STATE_CONNECTING; session->io = g_io_channel_ref(chan); - session->io_id = g_io_add_watch(chan, flags, (GIOFunc) session_cb, - session); - if (avdtp_is_connected(&src, &dst)) goto proceed; |