diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2012-01-18 13:01:16 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2012-01-18 13:01:16 -0600 |
| commit | ae5829e9847228a6bf7a41aed8604ef57c2a59c5 (patch) | |
| tree | 167811dc939f90f1adb671f17c1ab7aa8f48c169 /src/modem.c | |
| parent | d218070689959357aa349f9cd7db1cc8a43cfb5e (diff) | |
| download | ofono-ae5829e9847228a6bf7a41aed8604ef57c2a59c5.tar.bz2 | |
modem: Use __ofono_atom_find
Also remove defunct comment about registered status
Diffstat (limited to 'src/modem.c')
| -rw-r--r-- | src/modem.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/modem.c b/src/modem.c index 2c447d88..1a269919 100644 --- a/src/modem.c +++ b/src/modem.c @@ -767,7 +767,7 @@ void __ofono_modem_append_properties(struct ofono_modem *modem, char **features; int i; GSList *l; - struct ofono_atom *devinfo_atom; + struct ofono_devinfo *info; dbus_bool_t emergency = ofono_modem_get_emergency_mode(modem); const char *strtype; @@ -783,14 +783,8 @@ void __ofono_modem_append_properties(struct ofono_modem *modem, ofono_dbus_dict_append(dict, "Emergency", DBUS_TYPE_BOOLEAN, &emergency); - devinfo_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_DEVINFO); - - /* We cheat a little here and don't check the registered status */ - if (devinfo_atom) { - struct ofono_devinfo *info; - - info = __ofono_atom_get_data(devinfo_atom); - + info = __ofono_atom_find(OFONO_ATOM_TYPE_DEVINFO, modem); + if (info) { if (info->manufacturer) ofono_dbus_dict_append(dict, "Manufacturer", DBUS_TYPE_STRING, |