diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-04-11 22:46:22 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-04-11 22:46:22 +0000 |
| commit | 1f6bcd79a30ce899eec1245956c48876831439eb (patch) | |
| tree | 78f2f104189fd426c1ddd5b57a7e307b0b6b3d21 /audio/headset.c | |
| parent | eca0800a92771ee23890fdf54a70629bcbca648c (diff) | |
Let the manager use global variables
Diffstat (limited to 'audio/headset.c')
| -rw-r--r-- | audio/headset.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/audio/headset.c b/audio/headset.c index ab4c4d8f..0592d9fa 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -401,8 +401,7 @@ static void auth_callback(DBusPendingCall *call, void *data) dbus_message_unref(reply); } -gboolean headset_server_io_cb(GIOChannel *chan, GIOCondition cond, - struct manager *manager) +gboolean headset_server_io_cb(GIOChannel *chan, GIOCondition cond, void *data) { int srv_sk, cli_sk; struct sockaddr_rc addr; @@ -413,8 +412,6 @@ gboolean headset_server_io_cb(GIOChannel *chan, GIOCondition cond, DBusMessage *auth; DBusPendingCall *pending; - assert(manager != NULL); - if (cond & G_IO_NVAL) return FALSE; @@ -434,17 +431,16 @@ gboolean headset_server_io_cb(GIOChannel *chan, GIOCondition cond, return TRUE; } - hs = manager_find_headset_by_bda(manager, &addr.rc_bdaddr); + hs = manager_find_headset_by_bda(&addr.rc_bdaddr); if (!hs) { - hs = headset_new(manager_get_dbus_conn(manager), - &addr.rc_bdaddr); + hs = headset_new(manager_get_dbus_conn(), &addr.rc_bdaddr); if (!hs) { error("Unable to create a new headset object"); close(cli_sk); return TRUE; } - manager_add_headset(manager, hs); + manager_add_headset(hs); } if (hs->state > HEADSET_STATE_DISCONNECTED || hs->rfcomm) { |