Attachment 57136 Details for Bug 46152 – Put Call1 in the node name, filename of Call1 sub-objects

[patch] Put Call1 in the node name, filename of Call1 sub-objects

0002-Put-Call1-in-the-node-name-filename-of-Call1-sub-obj.patch (text/plain), 13.25 KB, created by Simon McVittie on 2012-02-16 02:31:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-16 02:31:48 UTC

Size: 13.25 KB

patch

obsolete

>From f722dee90075cfa99ad756354811a1d94e9cb662 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 16 Feb 2012 10:08:48 +0000
>Subject: [PATCH 2/3] Put Call1 in the node name, filename of Call1
> sub-objects
>
>---
> spec/{Call_Content.xml => Call1_Content.xml}       |    2 +-
> ... => Call1_Content_Interface_Audio_Control1.xml} |    2 +-
> ...Media.xml => Call1_Content_Interface_Media.xml} |    2 +-
> ... => Call1_Content_Interface_Video_Control1.xml} |    2 +-
> ...ion.xml => Call1_Content_Media_Description.xml} |    2 +-
> ...scription_Interface_RTCP_Extended_Reports1.xml} |    2 +-
> ...Media_Description_Interface_RTCP_Feedback1.xml} |    2 +-
> ...scription_Interface_RTP_Header_Extensions1.xml} |    2 +-
> ...Interface_Mute.xml => Call1_Interface_Mute.xml} |    2 +-
> spec/{Call_Stream.xml => Call1_Stream.xml}         |    2 +-
> ...ream_Endpoint.xml => Call1_Stream_Endpoint.xml} |    2 +-
> ..._Media.xml => Call1_Stream_Interface_Media.xml} |    2 +-
> spec/all.xml                                       |   24 ++++++++++----------
> 13 files changed, 24 insertions(+), 24 deletions(-)
> rename spec/{Call_Content.xml => Call1_Content.xml} (99%)
> rename spec/{Call_Content_Interface_Audio_Control1.xml => Call1_Content_Interface_Audio_Control1.xml} (99%)
> rename spec/{Call_Content_Interface_Media.xml => Call1_Content_Interface_Media.xml} (99%)
> rename spec/{Call_Content_Interface_Video_Control1.xml => Call1_Content_Interface_Video_Control1.xml} (98%)
> rename spec/{Call_Content_Media_Description.xml => Call1_Content_Media_Description.xml} (99%)
> rename spec/{Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml => Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml} (97%)
> rename spec/{Call_Content_Media_Description_Interface_RTCP_Feedback1.xml => Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml} (97%)
> rename spec/{Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml => Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml} (95%)
> rename spec/{Call_Interface_Mute.xml => Call1_Interface_Mute.xml} (98%)
> rename spec/{Call_Stream.xml => Call1_Stream.xml} (99%)
> rename spec/{Call_Stream_Endpoint.xml => Call1_Stream_Endpoint.xml} (99%)
> rename spec/{Call_Stream_Interface_Media.xml => Call1_Stream_Interface_Media.xml} (99%)
>
>diff --git a/spec/Call_Content.xml b/spec/Call1_Content.xml
>similarity index 99%
>rename from spec/Call_Content.xml
>rename to spec/Call1_Content.xml
>index 58ff7c9..52b75bf 100644
>--- a/spec/Call_Content.xml
>+++ b/spec/Call1_Content.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Content"
>+<node name="/Call1_Content"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
>   <tp:copyright>Copyright Â© 2009-2010 Nokia Corporation</tp:copyright>
>diff --git a/spec/Call_Content_Interface_Audio_Control1.xml b/spec/Call1_Content_Interface_Audio_Control1.xml
>similarity index 99%
>rename from spec/Call_Content_Interface_Audio_Control1.xml
>rename to spec/Call1_Content_Interface_Audio_Control1.xml
>index be7b659..2531fdb 100644
>--- a/spec/Call_Content_Interface_Audio_Control1.xml
>+++ b/spec/Call1_Content_Interface_Audio_Control1.xml
>@@ -1,5 +1,5 @@
> <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
>-<node name="/Call_Content_Interface_Audio_Control1"
>+<node name="/Call1_Content_Interface_Audio_Control1"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2011 Collabora Ltd.</tp:copyright>
>   <tp:license xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call1_Content_Interface_Media.xml
>similarity index 99%
>rename from spec/Call_Content_Interface_Media.xml
>rename to spec/Call1_Content_Interface_Media.xml
>index a336a5f..1b959e8 100644
>--- a/spec/Call_Content_Interface_Media.xml
>+++ b/spec/Call1_Content_Interface_Media.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Content_Interface_Media"
>+<node name="/Call1_Content_Interface_Media"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
>   <tp:copyright>Copyright Â© 2009-2010 Nokia Corporation</tp:copyright>
>diff --git a/spec/Call_Content_Interface_Video_Control1.xml b/spec/Call1_Content_Interface_Video_Control1.xml
>similarity index 98%
>rename from spec/Call_Content_Interface_Video_Control1.xml
>rename to spec/Call1_Content_Interface_Video_Control1.xml
>index 5da172b..8545a1a 100644
>--- a/spec/Call_Content_Interface_Video_Control1.xml
>+++ b/spec/Call1_Content_Interface_Video_Control1.xml
>@@ -1,5 +1,5 @@
> <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
>-<node name="/Call_Content_Interface_Video_Control1"
>+<node name="/Call1_Content_Interface_Video_Control1"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2011 Collabora Ltd.</tp:copyright>
>   <tp:license xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/spec/Call_Content_Media_Description.xml b/spec/Call1_Content_Media_Description.xml
>similarity index 99%
>rename from spec/Call_Content_Media_Description.xml
>rename to spec/Call1_Content_Media_Description.xml
>index a22329b..e29631d 100644
>--- a/spec/Call_Content_Media_Description.xml
>+++ b/spec/Call1_Content_Media_Description.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Content_Media_Description"
>+<node name="/Call1_Content_Media_Description"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
>   <tp:copyright>Copyright Â© 2009-2010 Nokia Corporation</tp:copyright>
>diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml b/spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
>similarity index 97%
>rename from spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
>rename to spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
>index efefa11..b1ee89b 100644
>--- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
>+++ b/spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>+<node name="/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright> Copyright Â© 2005-2010 Nokia Corporation </tp:copyright>
>   <tp:copyright> Copyright Â© 2005-2010 Collabora Ltd </tp:copyright>
>   <tp:license xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml b/spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml
>similarity index 97%
>rename from spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
>rename to spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml
>index 5a7f067..9c32bbd 100644
>--- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
>+++ b/spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Content_Media_Description_Interface_RTCP_Feedback1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>+<node name="/Call1_Content_Media_Description_Interface_RTCP_Feedback1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright> Copyright Â© 2005-2010 Nokia Corporation </tp:copyright>
>   <tp:copyright> Copyright Â© 2005-2010 Collabora Ltd </tp:copyright>
>   <tp:license xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml b/spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
>similarity index 95%
>rename from spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
>rename to spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
>index ef3214a..62f8936 100644
>--- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
>+++ b/spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Content_Media_Description_Interface_RTP_Header_Extensions1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>+<node name="/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright> Copyright Â© 2005-2010 Nokia Corporation </tp:copyright>
>   <tp:copyright> Copyright Â© 2005-2010 Collabora Ltd </tp:copyright>
>   <tp:license xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/spec/Call_Interface_Mute.xml b/spec/Call1_Interface_Mute.xml
>similarity index 98%
>rename from spec/Call_Interface_Mute.xml
>rename to spec/Call1_Interface_Mute.xml
>index 4d3f0bf..d8b0c05 100644
>--- a/spec/Call_Interface_Mute.xml
>+++ b/spec/Call1_Interface_Mute.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Interface_Mute" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>+<node name="/Call1_Interface_Mute" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright> Copyright Â© 2005-2010 Nokia Corporation </tp:copyright>
>   <tp:copyright> Copyright Â© 2005-2010 Collabora Ltd </tp:copyright>
>   <tp:license xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/spec/Call_Stream.xml b/spec/Call1_Stream.xml
>similarity index 99%
>rename from spec/Call_Stream.xml
>rename to spec/Call1_Stream.xml
>index 13d5549..635427a 100644
>--- a/spec/Call_Stream.xml
>+++ b/spec/Call1_Stream.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Stream"
>+<node name="/Call1_Stream"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
>   <tp:copyright>Copyright Â© 2009-2010 Nokia Corporation</tp:copyright>
>diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call1_Stream_Endpoint.xml
>similarity index 99%
>rename from spec/Call_Stream_Endpoint.xml
>rename to spec/Call1_Stream_Endpoint.xml
>index c52b7da..3708d9e 100644
>--- a/spec/Call_Stream_Endpoint.xml
>+++ b/spec/Call1_Stream_Endpoint.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Stream_Endpoint"
>+<node name="/Call1_Stream_Endpoint"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
>   <tp:copyright>Copyright Â© 2009-2010 Nokia Corporation</tp:copyright>
>diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call1_Stream_Interface_Media.xml
>similarity index 99%
>rename from spec/Call_Stream_Interface_Media.xml
>rename to spec/Call1_Stream_Interface_Media.xml
>index 5ca1700..048fb59 100644
>--- a/spec/Call_Stream_Interface_Media.xml
>+++ b/spec/Call1_Stream_Interface_Media.xml
>@@ -1,5 +1,5 @@
> <?xml version="1.0" ?>
>-<node name="/Call_Stream_Interface_Media"
>+<node name="/Call1_Stream_Interface_Media"
>   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
>   <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
>   <tp:copyright>Copyright Â© 2009-2010 Nokia Corporation</tp:copyright>
>diff --git a/spec/all.xml b/spec/all.xml
>index 64330ad..ed5c730 100644
>--- a/spec/all.xml
>+++ b/spec/all.xml
>@@ -216,19 +216,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
>  </tp:section>
> 
>  <tp:section name="Calls">
>-   <xi:include href="Call_Content.xml"/>
>-   <xi:include href="Call_Content_Interface_Media.xml"/>
>-   <xi:include href="Call_Interface_Mute.xml"/>
>-   <xi:include href="Call_Content_Interface_Video_Control1.xml"/>
>-   <xi:include href="Call_Content_Interface_Audio_Control1.xml"/>
>-   <xi:include href="Call_Content_Media_Description.xml"/>
>-   <xi:include href="Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml"/>
>-   <xi:include href="Call_Content_Media_Description_Interface_RTCP_Feedback1.xml"/>
>+   <xi:include href="Call1_Content.xml"/>
>+   <xi:include href="Call1_Content_Interface_Media.xml"/>
>+   <xi:include href="Call1_Interface_Mute.xml"/>
>+   <xi:include href="Call1_Content_Interface_Video_Control1.xml"/>
>+   <xi:include href="Call1_Content_Interface_Audio_Control1.xml"/>
>+   <xi:include href="Call1_Content_Media_Description.xml"/>
>+   <xi:include href="Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml"/>
>+   <xi:include href="Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml"/>
>    <xi:include
>-   href="Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml"/>
>-   <xi:include href="Call_Stream.xml"/>
>-   <xi:include href="Call_Stream_Interface_Media.xml"/>
>-   <xi:include href="Call_Stream_Endpoint.xml"/>
>+   href="Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml"/>
>+   <xi:include href="Call1_Stream.xml"/>
>+   <xi:include href="Call1_Stream_Interface_Media.xml"/>
>+   <xi:include href="Call1_Stream_Endpoint.xml"/>
>  </tp:section>
> 
>  <tp:section name="Debugging">
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 46152: 57135 | 57136 | 57137

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.