Attachment 72519 Details for Bug 14540 – Fix interface namespacing

[patch] Fix interface namespacing

0006-Fix-interface-namespacing.patch (text/plain), 4.38 KB, created by Simon McVittie on 2013-01-04 18:50:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-01-04 18:50:51 UTC

Size: 4.38 KB

patch

obsolete

>From 8b33e83a54d55ca1b0a77a0324f609b7dfc1c05c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 4 Jan 2013 17:30:41 +0000
>Subject: [PATCH 6/7] Fix interface namespacing
>
>---
> spec/Connection_Interface_Avatars1.xml | 24 ++++++++++++------------
> spec/Connection_Interface_Names1.xml | 6 +++---
> 2 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/spec/Connection_Interface_Avatars1.xml b/spec/Connection_Interface_Avatars1.xml
>index 0b24cc7..a747d24 100644
>--- a/spec/Connection_Interface_Avatars1.xml
>+++ b/spec/Connection_Interface_Avatars1.xml
>@@ -18,13 +18,13 @@ Lesser General Public License for more details.
> 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="im.telepathy1.Connection.Interface.Avatars1">
>- <tp:requires interface="im.telepathy1.Connection"/>
>+ <interface name="org.freedesktop.Telepathy.Connection.Interface.Avatars1">
>+ <tp:requires interface="ofdT.Connection"/>
> 
> <tp:client-interest>
> <tp:docstring>
> Clients wanting to get up to date avatars SHOULD claim its interest in
>- this interface using <tp:dbus-ref namespace="imt1.Connection"
>+ this interface using <tp:dbus-ref namespace="ofdT.Connection"
> >AddClientInterest</tp:dbus-ref>.
> 
> When at least one client claimed interest in avatars, the Connection
>@@ -126,8 +126,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
> contact attributes.
> </tp:docstring>
> <tp:possible-errors>
>- <tp:error name="im.telepathy1.Error.Disconnected"/>
>- <tp:error name="im.telepathy1.Error.InvalidHandle"/>
>+ <tp:error name="ofdT.Error.Disconnected"/>
>+ <tp:error name="ofdT.Error.InvalidHandle"/>
> </tp:possible-errors>
> </method>
> 
>@@ -148,11 +148,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
> interface.
> </tp:docstring>
> <tp:possible-errors>
>- <tp:error name="im.telepathy1.Error.Disconnected"/>
>- <tp:error name="im.telepathy1.Error.NetworkError"/>
>- <tp:error name="im.telepathy1.Error.InvalidArgument"/>
>- <tp:error name="im.telepathy1.Error.PermissionDenied"/>
>- <tp:error name="im.telepathy1.Error.NotAvailable"/>
>+ <tp:error name="ofdT.Error.Disconnected"/>
>+ <tp:error name="ofdT.Error.NetworkError"/>
>+ <tp:error name="ofdT.Error.InvalidArgument"/>
>+ <tp:error name="ofdT.Error.PermissionDenied"/>
>+ <tp:error name="ofdT.Error.NotAvailable"/>
> </tp:possible-errors>
> </method>
> 
>@@ -162,8 +162,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
> Remove the avatar image for this connection.
> </tp:docstring>
> <tp:possible-errors>
>- <tp:error name="im.telepathy1.Error.Disconnected"/>
>- <tp:error name="im.telepathy1.Error.NetworkError"/>
>+ <tp:error name="ofdT.Error.Disconnected"/>
>+ <tp:error name="ofdT.Error.NetworkError"/>
> </tp:possible-errors>
> </method>
> 
>diff --git a/spec/Connection_Interface_Names1.xml b/spec/Connection_Interface_Names1.xml
>index 517c71a..b62e455 100644
>--- a/spec/Connection_Interface_Names1.xml
>+++ b/spec/Connection_Interface_Names1.xml
>@@ -3,7 +3,7 @@
> <tp:copyright>Copyright Â© 2009-2010 Collabora Ltd.</tp:copyright>
> <tp:copyright>Copyright Â© 2009 Nokia Corporation</tp:copyright>
> 
>- <interface name="ofdT.Connection.Interface.Names1">
>+ <interface name="org.freedesktop.Telepathy.Connection.Interface.Names1">
> <tp:requires interface="ofdT.Connection"/>
> 
> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
>@@ -124,9 +124,9 @@
> The local user's own nickname.
> 
> On connections managed by the <tp:dbus-ref
>- namespace="imt1">AccountManager</tp:dbus-ref>,
>+ namespace="ofdT">AccountManager</tp:dbus-ref>,
> clients other than the account manager SHOULD set the <tp:dbus-ref
>- namespace="imt1">Account.Nickname</tp:dbus-ref>
>+ namespace="ofdT">Account.Nickname</tp:dbus-ref>
> property instead, which will result in a change to this
> property next time the account is online (or immediately, if it
> is already online).
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 14540: 56334 | 72519 | 72520

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.