diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-15 14:59:10 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-15 14:59:10 +0100 |
| commit | 22e7ae70c020fb92c21cdb3f3b9bc388e80a642c (patch) | |
| tree | 5afb51056bc016d53dac3252ed73e10eceea9b2f | |
| parent | 097aa8598d91a8bcda334e533d9e5ee841e0bb10 (diff) | |
Back out the HungUp error code for the momenttelepathy-spec-0.21.2
We already have Cancelled and Terminated, which are used in StreamedMedia
to represent normal termination by local or remote user request; leaving
out HungUp for now lets us either re-introduce it later, or separate
Cancelled from Terminated.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | spec/Channel_Type_Call.xml | 8 | ||||
| -rw-r--r-- | spec/errors.xml | 8 |
3 files changed, 5 insertions, 13 deletions
@@ -9,7 +9,7 @@ The "Ponderer of Witty Job Titles" release. New stable API: -• HungUp and Rejected errors for use with Call (jonny) +• Rejected error code for use with Call (jonny) • StreamHandler now has StartNamedTelephonyEvent and StartSoundTelephonyEvent signals (ocrete) diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml index 91381664..50bf83f2 100644 --- a/spec/Channel_Type_Call.xml +++ b/spec/Channel_Type_Call.xml @@ -242,7 +242,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> will change to (self handle, <tp:type>Call_State_Change_Reason</tp:type>_User_Requested, - "org.freedesktop.Telepathy.Error.HungUp").</p> + "org.freedesktop.Telepathy.Error.Cancelled").</p> <p>If the other participant hangs up first then the <tp:member-ref>CallState</tp:member-ref> property will change to @@ -250,7 +250,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> will change to (remote contact, <tp:type>Call_State_Change_Reason</tp:type>_User_Requested, - "org.freedesktop.Telepathy.Error.HungUp").</p> + "org.freedesktop.Telepathy.Error.Terminated").</p> <h4>Multi-party calls</h4> @@ -325,7 +325,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <td><tp:type>Call_State</tp:type>_Ended</td> <td>Self handle</td> <td><tp:type>Call_State_Change_Reason</tp:type>_User_Requested</td> - <td><tp:error-ref>HungUp</tp:error-ref></td> + <td><tp:error-ref>Cancelled</tp:error-ref></td> <td>The local user hung up the incoming or outgoing call.</td> </tr> <tr> @@ -333,7 +333,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <td><tp:type>Call_State</tp:type>_Ended</td> <td>Remote contact handle</td> <td><tp:type>Call_State_Change_Reason</tp:type>_User_Requested</td> - <td><tp:error-ref>HungUp</tp:error-ref></td> + <td><tp:error-ref>Terminated</tp:error-ref></td> <td>The remote contact hung up the incoming or outgoing call.</td> </tr> <tr> diff --git a/spec/errors.xml b/spec/errors.xml index c5e91af7..58a9d9d5 100644 --- a/spec/errors.xml +++ b/spec/errors.xml @@ -500,14 +500,6 @@ </tp:docstring> </tp:error> - <tp:error name="Hung Up"> - <tp:added version="0.21.2"/> - <tp:docstring> - Raised when a call was terminated as a result of one of the - participants hanging up. - </tp:docstring> - </tp:error> - <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright> <tp:copyright>Copyright © 2005-2009 Nokia Corporation</tp:copyright> <tp:license xmlns="http://www.w3.org/1999/xhtml"> |