diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-12-12 18:57:00 +0100 |
|---|---|---|
| committer | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-12-12 19:00:35 +0100 |
| commit | dd77dd6f6888e128e66825e4b53c528a6531d420 (patch) | |
| tree | 051471ca6e03fa7fa42b704421265db25b28f497 /plugins/ofono.c | |
| parent | 62707bec15cf177cf094686a8989f8c657c08d2d (diff) | |
| download | connman-dd77dd6f6888e128e66825e4b53c528a6531d420.tar.gz connman-dd77dd6f6888e128e66825e4b53c528a6531d420.tar.bz2 connman-dd77dd6f6888e128e66825e4b53c528a6531d420.zip | |
ofono: Move cm attached update into a function
Diffstat (limited to 'plugins/ofono.c')
| -rw-r--r-- | plugins/ofono.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/plugins/ofono.c b/plugins/ofono.c index 9abee4ba..378e49dc 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -1368,6 +1368,24 @@ static int netreg_get_properties(struct modem_data *modem) netreg_properties_reply, modem); } +static void cm_update_attached(struct modem_data *modem, + DBusMessageIter *value) +{ + dbus_message_iter_get_basic(value, &modem->attached); + + DBG("%s Attached %d", modem->path, modem->attached); + + if (modem->attached == FALSE) + return; + + if (has_interface(modem->interfaces, + OFONO_API_NETREG) == FALSE) { + return; + } + + netreg_get_properties(modem); +} + static gboolean cm_changed(DBusConnection *connection, DBusMessage *message, void *user_data) { @@ -1392,16 +1410,7 @@ static gboolean cm_changed(DBusConnection *connection, DBusMessage *message, dbus_message_iter_recurse(&iter, &value); if (g_str_equal(key, "Attached") == TRUE) { - dbus_message_iter_get_basic(&value, &modem->attached); - - DBG("%s Attached %d", modem->path, modem->attached); - - if (modem->attached == TRUE) { - if (has_interface(modem->interfaces, - OFONO_API_NETREG) == TRUE) { - netreg_get_properties(modem); - } - } + cm_update_attached(modem, &value); } else if (g_str_equal(key, "Powered") == TRUE) { dbus_message_iter_get_basic(&value, &modem->cm_powered); @@ -1430,17 +1439,7 @@ static void cm_properties_reply(struct modem_data *modem, DBusMessageIter *dict) dbus_message_iter_recurse(&entry, &value); if (g_str_equal(key, "Attached") == TRUE) { - dbus_message_iter_get_basic(&value, &modem->attached); - - DBG("%s Attached %d", modem->path, - modem->attached); - - if (modem->attached == TRUE) { - if (has_interface(modem->interfaces, - OFONO_API_NETREG) == TRUE) { - netreg_get_properties(modem); - } - } + cm_update_attached(modem, &value); } else if (g_str_equal(key, "Powered") == TRUE) { dbus_message_iter_get_basic(&value, &modem->cm_powered); |