diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-04 16:08:49 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-12-08 16:10:57 +0200 |
| commit | 2150eb91a7ccc476e3caa07da4d79ad1a5ed4c71 (patch) | |
| tree | 6c462e7a21b1b805a8f31e78c3b306db37c849d3 /audio | |
| parent | bc9238c99f3ebe7e51a28c3a4f63402891eb85d7 (diff) | |
Update telephony-maemo to match current csd-call API
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/telephony-maemo.c | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/audio/telephony-maemo.c b/audio/telephony-maemo.c index 2bcfff8b..ddc5a461 100644 --- a/audio/telephony-maemo.c +++ b/audio/telephony-maemo.c @@ -702,7 +702,7 @@ static void get_remote_reply(DBusPendingCall *pending_call, void *user_data) DBusMessage *reply; DBusError err; const char *number; - uint8_t direction; + dbus_bool_t originating, terminating; reply = dbus_pending_call_steal_reply(pending_call); @@ -717,7 +717,8 @@ static void get_remote_reply(DBusPendingCall *pending_call, void *user_data) dbus_error_init(&err); if (!dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING, &number, - DBUS_TYPE_BYTE, &direction, + DBUS_TYPE_BOOLEAN, &originating, + DBUS_TYPE_BOOLEAN, &terminating, DBUS_TYPE_INVALID)) { error("Unexpected paramters in %s GetRemote reply:", call->object_path, err.name, err.message); @@ -731,7 +732,7 @@ static void get_remote_reply(DBusPendingCall *pending_call, void *user_data) g_free(call->number); call->number = g_strdup(number); - if (direction == CSD_CALL_DIRECTION_OUTGOING) { + if (originating) { g_free(last_dialed_number); last_dialed_number = g_strdup(number); } @@ -767,10 +768,12 @@ static void resolve_number(struct csd_call *call) static void handle_call_status(DBusMessage *msg, const char *call_path) { struct csd_call *call, *active_call; - uint8_t status; + dbus_uint32_t status, cause_type, cause; if (!dbus_message_get_args(msg, NULL, - DBUS_TYPE_BYTE, &status, + DBUS_TYPE_UINT32, &status, + DBUS_TYPE_UINT32, &cause_type, + DBUS_TYPE_UINT32, &cause, DBUS_TYPE_INVALID)) { error("Unexpected paramters in Instance.CallStatus() signal"); return; @@ -892,21 +895,6 @@ static void handle_call_status(DBusMessage *msg, const char *call_path) call->status = (int) status; } -static void handle_call_error(DBusMessage *msg, const char *call_path) -{ - uint8_t type, code; - - if (!dbus_message_get_args(msg, NULL, - DBUS_TYPE_BYTE, &type, - DBUS_TYPE_BYTE, &code, - DBUS_TYPE_INVALID)) { - error("Unexpected parameters to CallServiceError"); - return; - } - - debug("telephony-maemo: CallServiceError(%u, %u)", type, code); -} - static void get_operator_name_reply(DBusPendingCall *pending_call, void *user_data) { @@ -1123,9 +1111,6 @@ static DBusHandlerResult cs_signal_filter(DBusConnection *conn, handle_incoming_call(msg); else if (dbus_message_is_signal(msg, CSD_CALL_INSTANCE, "CallStatus")) handle_call_status(msg, path); - else if (dbus_message_is_signal(msg, CSD_CALL_INSTANCE, - "CallServiceError")) - handle_call_error(msg, path); else if (dbus_message_is_signal(msg, NETWORK_INTERFACE, "registration_status_change")) handle_registration_status_change(msg); @@ -1192,8 +1177,8 @@ static void parse_call_list(DBusMessageIter *iter) DBUS_TYPE_UINT32, &status, DBUS_TYPE_BOOLEAN, &originating, DBUS_TYPE_BOOLEAN, &terminating, - DBUS_TYPE_BOOLEAN, &on_hold, DBUS_TYPE_BOOLEAN, &emerg, + DBUS_TYPE_BOOLEAN, &on_hold, DBUS_TYPE_BOOLEAN, &conf, DBUS_TYPE_STRING, &number, DBUS_TYPE_INVALID)) { |