From 255c6ba0d9e34d517bd17614d12e44573eea62a9 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 17 Aug 2009 15:14:05 -0500 Subject: Cleanup atom watches properly --- src/call-settings.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/call-settings.c') diff --git a/src/call-settings.c b/src/call-settings.c index 249ff508..6928ee2e 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -61,6 +61,7 @@ struct ofono_call_settings { int ss_req_cls; enum call_setting_type ss_setting; struct ofono_ussd *ussd; + unsigned int ussd_watch; const struct ofono_call_settings_driver *driver; void *driver_data; struct ofono_atom *atom; @@ -1178,6 +1179,9 @@ static void call_settings_unregister(struct ofono_atom *atom) if (cs->ussd) cs_unregister_ss_controls(cs); + + if (cs->ussd_watch) + __ofono_modem_remove_atom_watch(modem, cs->ussd_watch); } static void call_settings_remove(struct ofono_atom *atom) @@ -1268,8 +1272,10 @@ void ofono_call_settings_register(struct ofono_call_settings *cs) ofono_modem_add_interface(modem, OFONO_CALL_SETTINGS_INTERFACE); - __ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_USSD, + cs->ussd_watch = __ofono_modem_add_atom_watch(modem, + OFONO_ATOM_TYPE_USSD, ussd_watch, cs, NULL); + ussd_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_USSD); if (ussd_atom && __ofono_atom_get_registered(ussd_atom)) -- cgit v1.2.3