diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-01-05 05:14:29 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-01-05 05:14:29 -0800 |
| commit | cec31fbcdf1be94f060ba4e02db074b6a654afbd (patch) | |
| tree | c06cd7ab95a03c9f75f5b0a817945a13028f42fb /src/manager.c | |
| parent | f5d476e9d5ecaa45e22823b2a21a1e2fad775aff (diff) | |
| download | connman-cec31fbcdf1be94f060ba4e02db074b6a654afbd.tar.gz connman-cec31fbcdf1be94f060ba4e02db074b6a654afbd.tar.bz2 connman-cec31fbcdf1be94f060ba4e02db074b6a654afbd.zip | |
Move online/offline state handling into notifier framework
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/manager.c b/src/manager.c index cc5d163d..7b2f9963 100644 --- a/src/manager.c +++ b/src/manager.c @@ -64,11 +64,7 @@ static DBusMessage *get_properties(DBusConnection *conn, connman_dbus_dict_append_array(&dict, "Devices", DBUS_TYPE_OBJECT_PATH, __connman_device_list, NULL); - if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0) - str = "online"; - else - str = "offline"; - + str = __connman_notifier_get_state(); connman_dbus_dict_append_basic(&dict, "State", DBUS_TYPE_STRING, &str); @@ -154,10 +150,7 @@ static DBusMessage *get_state(DBusConnection *conn, CONNMAN_SECURITY_PRIVILEGE_PUBLIC) < 0) return __connman_error_permission_denied(msg); - if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0) - str = "online"; - else - str = "offline"; + str = __connman_notifier_get_state(); return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID); @@ -627,7 +620,7 @@ static DBusMessage *nm_state(DBusConnection *conn, if (reply == NULL) return NULL; - if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0) + if (__connman_notifier_count_connected() > 0) state = NM_STATE_CONNECTED; else state = NM_STATE_DISCONNECTED; |