sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

core: remove redundant code

This commit is contained in:
Mika Liljeberg 2011-03-29 10:48:29 +03:00 committed by Denis Kenzior
parent 3c19134524
commit 0eedf42921
7 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/call-barring.c
View File

@ -1092,7 +1092,6 @@ void ofono_call_barring_register(struct ofono_call_barring *cb)
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(cb->atom);
struct ofono_modem *modem = __ofono_atom_get_modem(cb->atom);
struct ofono_atom *ussd_atom;
if (!g_dbus_register_interface(conn, path,
OFONO_CALL_BARRING_INTERFACE,
@ -1110,12 +1109,6 @@ void ofono_call_barring_register(struct ofono_call_barring *cb)
OFONO_ATOM_TYPE_USSD,
ussd_watch, cb, NULL);
ussd_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_USSD);
if (ussd_atom && __ofono_atom_get_registered(ussd_atom))
ussd_watch(ussd_atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED,
cb);
__ofono_atom_register(cb->atom, call_barring_unregister);
}

7
src/call-forwarding.c
View File

@ -1539,7 +1539,6 @@ void ofono_call_forwarding_register(struct ofono_call_forwarding *cf)
const char *path = __ofono_atom_get_path(cf->atom);
struct ofono_modem *modem = __ofono_atom_get_modem(cf->atom);
struct ofono_atom *sim_atom;
struct ofono_atom *ussd_atom;
if (!g_dbus_register_interface(conn, path,
OFONO_CALL_FORWARDING_INTERFACE,
@ -1566,12 +1565,6 @@ void ofono_call_forwarding_register(struct ofono_call_forwarding *cf)
OFONO_ATOM_TYPE_USSD,
ussd_watch, cf, NULL);
ussd_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_USSD);
if (ussd_atom && __ofono_atom_get_registered(ussd_atom))
ussd_watch(ussd_atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED,
cf);
__ofono_atom_register(cf->atom, call_forwarding_unregister);
}

7
src/call-settings.c
View File

@ -1454,7 +1454,6 @@ void ofono_call_settings_register(struct ofono_call_settings *cs)
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(cs->atom);
struct ofono_modem *modem = __ofono_atom_get_modem(cs->atom);
struct ofono_atom *ussd_atom;
if (!g_dbus_register_interface(conn, path,
OFONO_CALL_SETTINGS_INTERFACE,
@ -1472,12 +1471,6 @@ void ofono_call_settings_register(struct ofono_call_settings *cs)
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))
ussd_watch(ussd_atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED,
cs);
__ofono_atom_register(cs->atom, call_settings_unregister);
}

7
src/cbs.c
View File

@ -1087,7 +1087,6 @@ void ofono_cbs_register(struct ofono_cbs *cbs)
const char *path = __ofono_atom_get_path(cbs->atom);
struct ofono_atom *sim_atom;
struct ofono_atom *stk_atom;
struct ofono_atom *netreg_atom;
if (!g_dbus_register_interface(conn, path,
OFONO_CELL_BROADCAST_INTERFACE,
@ -1119,12 +1118,6 @@ void ofono_cbs_register(struct ofono_cbs *cbs)
OFONO_ATOM_TYPE_NETREG,
netreg_watch, cbs, NULL);
netreg_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_NETREG);
if (netreg_atom && __ofono_atom_get_registered(netreg_atom))
netreg_watch(netreg_atom,
OFONO_ATOM_WATCH_CONDITION_REGISTERED, cbs);
__ofono_atom_register(cbs->atom, cbs_unregister);
}

7
src/gprs.c
View File

@ -2869,7 +2869,6 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
const char *path = __ofono_atom_get_path(gprs->atom);
struct ofono_atom *netreg_atom;
if (gprs->contexts == NULL) /* Automatic provisioning failed */
add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);
@ -2892,12 +2891,6 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
OFONO_ATOM_TYPE_NETREG,
netreg_watch, gprs, NULL);
netreg_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_NETREG);
if (netreg_atom && __ofono_atom_get_registered(netreg_atom))
netreg_watch(netreg_atom,
OFONO_ATOM_WATCH_CONDITION_REGISTERED, gprs);
__ofono_atom_register(gprs->atom, gprs_unregister);
}

11
src/sms.c
View File

@ -1955,7 +1955,6 @@ void ofono_sms_register(struct ofono_sms *sms)
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(sms->atom);
const char *path = __ofono_atom_get_path(sms->atom);
struct ofono_atom *atom;
struct ofono_atom *sim_atom;
if (!g_dbus_register_interface(conn, path,
@ -1974,20 +1973,10 @@ void ofono_sms_register(struct ofono_sms *sms)
OFONO_ATOM_TYPE_MESSAGE_WAITING,
mw_watch, sms, NULL);
atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_MESSAGE_WAITING);
if (atom && __ofono_atom_get_registered(atom))
mw_watch(atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED, sms);
sms->netreg_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_NETREG,
netreg_watch, sms, NULL);
atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_NETREG);
if (atom && __ofono_atom_get_registered(atom))
netreg_watch(atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED, sms);
sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM);
/*

6
src/voicecall.c
View File

@ -2368,7 +2368,6 @@ void ofono_voicecall_register(struct ofono_voicecall *vc)
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom);
const char *path = __ofono_atom_get_path(vc->atom);
struct ofono_atom *sim_atom;
if (!g_dbus_register_interface(conn, path,
OFONO_VOICECALL_MANAGER_INTERFACE,
@ -2393,11 +2392,6 @@ void ofono_voicecall_register(struct ofono_voicecall *vc)
OFONO_ATOM_TYPE_SIM,
sim_watch, vc, NULL);
sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM);
if (sim_atom && __ofono_atom_get_registered(sim_atom))
sim_watch(sim_atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED, vc);
__ofono_atom_register(vc->atom, voicecall_unregister);
}