summaryrefslogtreecommitdiffstats
path: root/audio/manager.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2008-09-03 14:06:40 +0300
committerJohan Hedberg <johan.hedberg@nokia.com>2008-09-03 14:06:40 +0300
commit8c565c2146ecb7cde3761c087b67618985ab4346 (patch)
tree32e8c59a3d2b6065ec447b4a3b5f6cb09544e3a4 /audio/manager.c
parent5c607b7899fd4e555b0d73e3dbe0ea0b4f6e6cfa (diff)
Add telephony initialization calls to correct places
Diffstat (limited to 'audio/manager.c')
-rw-r--r--audio/manager.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/audio/manager.c b/audio/manager.c
index ef8056de..f4905ea9 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -65,6 +65,7 @@
#include "control.h"
#include "manager.h"
#include "sdpd.h"
+#include "telephony.h"
typedef enum {
HEADSET = 1 << 0,
@@ -932,8 +933,11 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf)
g_strfreev(list);
proceed:
- if (enabled.headset)
+ if (enabled.headset) {
+ telephony_init();
+ telephony_features_req();
btd_register_adapter_driver(&headset_server_driver);
+ }
if (enabled.gateway)
btd_register_adapter_driver(&gateway_server_driver);
@@ -956,8 +960,10 @@ void audio_manager_exit(void)
if (config)
g_key_file_free(config);
- if (enabled.headset)
+ if (enabled.headset) {
btd_unregister_adapter_driver(&headset_server_driver);
+ telephony_exit();
+ }
if (enabled.gateway)
btd_unregister_adapter_driver(&gateway_server_driver);