mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 736258 - WebTelephony: rename ringing event to alerting. r=philikon

This commit is contained in:
Hsinyi Tsai 2012-03-16 11:13:42 +08:00
Родитель 3cc24bfd69
Коммит 7e9a3c910e
3 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
dom/telephony/TelephonyCall.cpp
Просмотреть файл

@ -79,7 +79,7 @@ TelephonyCall::ChangeStateInternal(PRUint16 aCallState, bool aFireEvents)
stateString.AssignLiteral("dialing");
break;
case nsIRadioInterfaceLayer::CALL_STATE_ALERTING:
stateString.AssignLiteral("ringing");
stateString.AssignLiteral("alerting");
break;
case nsIRadioInterfaceLayer::CALL_STATE_BUSY:
stateString.AssignLiteral("busy");
@ -158,7 +158,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TelephonyCall,
Telephony, "mTelephony")
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(statechange)
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(dialing)
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(ringing)
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(alerting)
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(busy)
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(connecting)
NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(connected)
@ -172,7 +172,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(TelephonyCall,
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTelephony)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(statechange)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(dialing)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(ringing)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(alerting)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(busy)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(connecting)
NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(connected)
@ -240,7 +240,7 @@ TelephonyCall::HangUp()
NS_IMPL_EVENT_HANDLER(TelephonyCall, statechange)
NS_IMPL_EVENT_HANDLER(TelephonyCall, dialing)
NS_IMPL_EVENT_HANDLER(TelephonyCall, ringing)
NS_IMPL_EVENT_HANDLER(TelephonyCall, alerting)
NS_IMPL_EVENT_HANDLER(TelephonyCall, busy)
NS_IMPL_EVENT_HANDLER(TelephonyCall, connecting)
NS_IMPL_EVENT_HANDLER(TelephonyCall, connected)

2
dom/telephony/TelephonyCall.h
Просмотреть файл

@ -54,7 +54,7 @@ class TelephonyCall : public nsDOMEventTargetHelper,
{
NS_DECL_EVENT_HANDLER(statechange)
NS_DECL_EVENT_HANDLER(dialing)
NS_DECL_EVENT_HANDLER(ringing)
NS_DECL_EVENT_HANDLER(alerting)
NS_DECL_EVENT_HANDLER(busy)
NS_DECL_EVENT_HANDLER(connecting)
NS_DECL_EVENT_HANDLER(connected)

4
dom/telephony/nsIDOMTelephonyCall.idl
Просмотреть файл

@ -41,7 +41,7 @@
interface nsIDOMEventListener;
[scriptable, builtinclass, uuid(832b7551-ff53-403f-9e2c-d7d28e2bb40b)]
[scriptable, builtinclass, uuid(f741d52a-38bd-48f8-838b-cf4cd74a6ea5)]
interface nsIDOMTelephonyCall : nsIDOMEventTarget
{
readonly attribute DOMString number;
@ -54,7 +54,7 @@ interface nsIDOMTelephonyCall : nsIDOMEventTarget
attribute nsIDOMEventListener onstatechange;
attribute nsIDOMEventListener ondialing;
attribute nsIDOMEventListener onringing;
attribute nsIDOMEventListener onalerting;
attribute nsIDOMEventListener onbusy;
attribute nsIDOMEventListener onconnecting;
attribute nsIDOMEventListener onconnected;