[Telepathy-commits] [telepathy-gabble/master] Update extensions/Location.xml from tp-spec

[Alban Crequy]

---
 extensions/Location.xml |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/extensions/Location.xml b/extensions/Location.xml
index b6a8a62..3fdda49 100644
--- a/extensions/Location.xml
+++ b/extensions/Location.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Location"
+<node name="/Connection_Interface_Location"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
@@ -18,13 +18,9 @@ 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.Connection.Interface.Location"
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.Location.DRAFT"
     tp:causes-havoc='experimental'>
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-    <tp:external-type name="Contact_Handle" />
-    <tp:external-type name="Contact_Handle[]" />
-    <tp:external-type name="Rich_Presence_Access_Control_Type[]" />
-    <tp:external-type name="Rich_Presence_Access_Control" />
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>An interface on connections to support protocols which allow users to
@@ -251,7 +247,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:member>
     </tp:mapping>
 
-    <method name="GetLocations">
+    <method name="GetLocations" tp:name-for-bindings="Get_Locations">
       <tp:docstring>
         Return the current locations of the given contacts, if they are
         already known. This method does not make any network requests.
@@ -274,7 +270,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </method>
 
-    <method name="RequestLocations">
+    <method name="RequestLocations" tp:name-for-bindings="Request_Locations">
       <tp:docstring>
         Return the current locations of the given contacts, if they are
         already known. If any of the given contacts' locations are not known,
@@ -300,7 +296,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </method>
 
-    <signal name="LocationUpdate">
+    <signal name="LocationUpdate" tp:name-for-bindings="Location_Update">
       <tp:docstring>
         Emitted when a contact's location changes or becomes known.
       </tp:docstring>
@@ -318,7 +314,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </signal>
 
-    <method name="SetLocation">
+    <method name="SetLocation" tp:name-for-bindings="SetLocation">
       <tp:docstring>
         Set the local user's own location.
       </tp:docstring>
@@ -338,13 +334,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </method>
 
     <property name="LocationAccessControlTypes" type="au" access="read"
-      tp:type="Rich_Presence_Access_Control_Type[]">
+      tp:type="Rich_Presence_Access_Control_Type[]" tp:name-for-bindings="Location_Access_Control_Types">
       <tp:docstring>The types of access control that are supported by this
         connection.</tp:docstring>
     </property>
 
     <property name="LocationAccessControl" type="(uv)" access="readwrite"
-      tp:type="Rich_Presence_Access_Control">
+      tp:type="Rich_Presence_Access_Control" tp:name-for-bindings="Location_Access_Control">
       <tp:docstring>The current access control mechanism and settings
         for this connection. Before publishing location for the first time,
         if this has not been set by a client, implementations SHOULD
-- 
1.5.6.5