summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-20 13:16:47 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-20 13:16:47 +0000
commit646ff1abacf8661bcb455a698d40cb01eef8b039 (patch)
treed1543321db2e5f0e0c0a93edc135710cf3716078
parentbbebb89936c257c98d11a3af43f84f77c9ca099d (diff)
parent4c651366bc34ae6aab83d77e0b5f8f61f2163442 (diff)
Merge remote-tracking branch 'xclaesse/call1'
By popular demand.
-rw-r--r--spec/Call_Content.xml3
-rw-r--r--spec/Call_Content_Interface_Audio_Control.xml3
-rw-r--r--spec/Call_Content_Interface_DTMF.xml3
-rw-r--r--spec/Call_Content_Interface_Media.xml3
-rw-r--r--spec/Call_Content_Interface_Video_Control.xml3
-rw-r--r--spec/Call_Content_Media_Description.xml3
-rw-r--r--spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml3
-rw-r--r--spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml3
-rw-r--r--spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml3
-rw-r--r--spec/Call_Stream.xml3
-rw-r--r--spec/Call_Stream_Endpoint.xml3
-rw-r--r--spec/Call_Stream_Interface_Media.xml3
-rw-r--r--spec/Channel_Type_Call.xml3
13 files changed, 13 insertions, 26 deletions
diff --git a/spec/Call_Content.xml b/spec/Call_Content.xml
index 0b4b5c6f..f738a289 100644
--- a/spec/Call_Content.xml
+++ b/spec/Call_Content.xml
@@ -20,8 +20,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content">
<tp:added version="0.19.0">(draft 1)</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Content_Interface_Audio_Control.xml b/spec/Call_Content_Interface_Audio_Control.xml
index b13e02f5..e21dae44 100644
--- a/spec/Call_Content_Interface_Audio_Control.xml
+++ b/spec/Call_Content_Interface_Audio_Control.xml
@@ -19,8 +19,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl">
<tp:added version="0.25.1">(draft 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content.Interface.Media"/>
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
diff --git a/spec/Call_Content_Interface_DTMF.xml b/spec/Call_Content_Interface_DTMF.xml
index 77c407e7..b7147afa 100644
--- a/spec/Call_Content_Interface_DTMF.xml
+++ b/spec/Call_Content_Interface_DTMF.xml
@@ -18,8 +18,7 @@ Lesser General Public License for more details.</p>
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.DTMF"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.DTMF">
<tp:added version="0.UNRELEASED">(draft 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/>
diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml
index 7f72f2c6..fe053e2b 100644
--- a/spec/Call_Content_Interface_Media.xml
+++ b/spec/Call_Content_Interface_Media.xml
@@ -21,8 +21,7 @@
</tp:license>
<interface
- name="org.freedesktop.Telepathy.Call1.Content.Interface.Media"
- tp:causes-havoc="experimental">
+ name="org.freedesktop.Telepathy.Call1.Content.Interface.Media">
<tp:added version="0.23.4">(draft 2)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/>
diff --git a/spec/Call_Content_Interface_Video_Control.xml b/spec/Call_Content_Interface_Video_Control.xml
index 086d4758..992dc230 100644
--- a/spec/Call_Content_Interface_Video_Control.xml
+++ b/spec/Call_Content_Interface_Video_Control.xml
@@ -19,8 +19,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl">
<tp:added version="0.21.10">(draft 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content.Interface.Media"/>
diff --git a/spec/Call_Content_Media_Description.xml b/spec/Call_Content_Media_Description.xml
index fd8ab89f..6ed7d08a 100644
--- a/spec/Call_Content_Media_Description.xml
+++ b/spec/Call_Content_Media_Description.xml
@@ -20,8 +20,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription">
<tp:added version="0.23.4">(draft 1)</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
index f973306c..ec1352eb 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
@@ -18,8 +18,7 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExtendedReports"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExtendedReports">
<tp:added version="0.23.4">(draft version, not API-stable)</tp:added>
<tp:requires
interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/>
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
index f586fe4c..b3d47361 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
@@ -18,8 +18,7 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFeedback"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFeedback">
<tp:added version="0.23.4">(draft version, not API-stable)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/>
diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
index a35615ad..0f0a5b19 100644
--- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
@@ -18,8 +18,7 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions">
<tp:added version="0.23.4">(draft version, not API-stable)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/>
diff --git a/spec/Call_Stream.xml b/spec/Call_Stream.xml
index b8b347d4..5f1321eb 100644
--- a/spec/Call_Stream.xml
+++ b/spec/Call_Stream.xml
@@ -20,8 +20,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Stream"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Stream">
<tp:added version="0.19.0">(draft 1)</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml
index 04681cfa..b03a1547 100644
--- a/spec/Call_Stream_Endpoint.xml
+++ b/spec/Call_Stream_Endpoint.xml
@@ -20,8 +20,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Stream.Endpoint"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Stream.Endpoint">
<tp:added version="0.19.0">(draft 1)</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 24686e96..b5ce347c 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -20,8 +20,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Call1.Stream.Interface.Media"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Call1.Stream.Interface.Media">
<tp:added version="0.19.0">(draft 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Stream"/>
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index db579929..84493e20 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -17,8 +17,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</tp:license>
- <interface name="org.freedesktop.Telepathy.Channel.Type.Call1"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Channel.Type.Call1">
<tp:added version="0.19.0">(draft 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Channel"/>