diff options
author | Denis Kenzior <denkenz@gmail.com> | 2010-02-16 09:55:47 -0600 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2010-02-16 10:17:52 -0600 |
commit | 1bebc1b4699e8aefdc1091de5e3522df62aadf4d (patch) | |
tree | 16528f6602522843a04331197156be5a893d1a6f | |
parent | 7d7739f7d633681c0a6b07499ce617efa2fd7196 (diff) | |
download | ofono-1bebc1b4699e8aefdc1091de5e3522df62aadf4d.tar.bz2 |
Cleanup: Minor API tweaks for USSD
-rw-r--r-- | doc/ussd-api.txt | 18 | ||||
-rw-r--r-- | src/ussd.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/ussd-api.txt b/doc/ussd-api.txt index 83d3cee7..23796c1b 100644 --- a/doc/ussd-api.txt +++ b/doc/ussd-api.txt @@ -49,16 +49,16 @@ Signals NotificationReceived(string message) Signal is emitted whenever a property has changed. The new value is passed as the signal argument. -Properties string USSDState [readonly] +Properties string State [readonly] Reflects the state of current USSD session. The values have the following meanings: - "idle" No active USSD session. - "active" A session is active between the - network and the ME, the ME is - waiting for a reply from the - network. - "awaiting-user-response" The network is waiting for the - user's response, client must - call Respond(). + "idle" No active USSD session. + "active" A session is active between the + network and the ME, the ME is + waiting for a reply from the + network. + "user-response" The network is waiting for the + user's response, client must + call Respond(). @@ -280,7 +280,7 @@ static const char *ussd_get_state_string(struct ofono_ussd *ussd) case USSD_STATE_ACTIVE: return "active"; case USSD_STATE_USER_ACTION: - return "awaiting-user-response"; + return "user-response"; } return ""; @@ -300,7 +300,7 @@ static void ussd_change_state(struct ofono_ussd *ussd, int state) value = ussd_get_state_string(ussd); ofono_dbus_signal_property_changed(conn, path, SUPPLEMENTARY_SERVICES_INTERFACE, - "USSDState", DBUS_TYPE_STRING, &value); + "State", DBUS_TYPE_STRING, &value); } void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) @@ -572,7 +572,7 @@ static DBusMessage *ussd_get_properties(DBusConnection *conn, &dict); value = ussd_get_state_string(ussd); - ofono_dbus_dict_append(&dict, "USSDState", DBUS_TYPE_STRING, &value); + ofono_dbus_dict_append(&dict, "State", DBUS_TYPE_STRING, &value); dbus_message_iter_close_container(&iter, &dict); |