[Telepathy-commits] [telepathy-gabble/master] merge Buddy and Activity views
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Fri Sep 26 10:02:15 PDT 2008
20080605141039-7fe3f-d02d479418a7777a47fd67f6a2dba17f580062e6.gz
---
extensions/OLPC_Activity_View.xml | 72 -------------------------
extensions/OLPC_Buddy_View.xml | 44 ----------------
extensions/OLPC_View.xml | 104 +++++++++++++++++++++++++++++++++++++
extensions/all.xml | 3 +-
4 files changed, 105 insertions(+), 118 deletions(-)
delete mode 100644 extensions/OLPC_Activity_View.xml
delete mode 100644 extensions/OLPC_Buddy_View.xml
create mode 100644 extensions/OLPC_View.xml
diff --git a/extensions/OLPC_Activity_View.xml b/extensions/OLPC_Activity_View.xml
deleted file mode 100644
index 7ad3c57..0000000
--- a/extensions/OLPC_Activity_View.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/OLPC_Activity_View" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright> Copyright (C) 2008 Collabora Limited </tp:copyright>
- <tp:license xmlns="http://www.w3.org/1999/xhtml">
- <p>This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.</p>
-
-<p>This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.</p>
-
-<p>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 St, Fifth Floor, Boston, MA 02110-1301 USA</p>
- </tp:license>
- <interface name="org.laptop.Telepathy.ActivityView">
-
- <method name="GetActivities">
- <arg direction="out" name="activities" type="au">
- <tp:docstring>
- An array of room handles
- </tp:docstring>
- </arg>
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Return all the activities of this view</p>
- </tp:docstring>
- <tp:possible-errors>
- </tp:possible-errors>
- </method>
-
- <method name="Close">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Close the view so we won't receive notifications about its
- result anymore. Method calls on the view are no longer valid after
- this call, and the connection manager may remove the object from
- the bus at any point.</p>
- </tp:docstring>
- <tp:possible-errors>
- </tp:possible-errors>
- </method>
-
- <signal name="Changed">
- <arg name="added" type="au">
- <tp:docstring>
- Room handles of the added activities
- </tp:docstring>
- </arg>
- <arg name="removed" type="au">
- <tp:docstring>
- Room handles of the removed activities
- </tp:docstring>
- </arg>
- <tp:docstring>
- Signal emitted when the activities in the view are changed.
- </tp:docstring>
- </signal>
-
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>An object representing the result of an activity search.</p>
- <p>Activity properties changes are notified on the Connection object using the
- <code>org.laptop.Telepathy.ActivityProperties</code> interface while the view object
- is alive.</p>
- <p>Members of the activities are notified on the Connection object using the
- <code>org.laptop.Telepathy.BuddyInfo</code> properties while the view object
- is alive.</p>
- </tp:docstring>
- </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/OLPC_Buddy_View.xml b/extensions/OLPC_Buddy_View.xml
deleted file mode 100644
index ab2b520..0000000
--- a/extensions/OLPC_Buddy_View.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/OLPC_Buddy_View" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright> Copyright (C) 2008 Collabora Limited </tp:copyright>
- <tp:license xmlns="http://www.w3.org/1999/xhtml">
- <p>This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.</p>
-
-<p>This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.</p>
-
-<p>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 St, Fifth Floor, Boston, MA 02110-1301 USA</p>
- </tp:license>
- <interface name="org.laptop.Telepathy.BuddyView">
- <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Group"/>
-
- <method name="Close">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Close the view so we won't receive notifications about its
- result anymore. Method calls on the view are no longer valid after
- this call, and the connection manager may remove the object from
- the bus at any point.</p>
- </tp:docstring>
- <tp:possible-errors>
- <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
- </tp:possible-errors>
- </method>
-
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>An object representing the result of a buddy search.</p>
- <p>Buddies handles are stored using the
- <code>org.freedesktop.Telepathy.Channel.Interface.Group</code> interface.</p>
- <p>Buddy properties changes are notified on the Connection object using the
- <code>org.laptop.Telepathy.BuddyInfo</code> interface while the view object
- is alive.</p>
- </tp:docstring>
- </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/OLPC_View.xml b/extensions/OLPC_View.xml
new file mode 100644
index 0000000..3d89425
--- /dev/null
+++ b/extensions/OLPC_View.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" ?>
+<node name="/OLPC_View" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+ <tp:copyright> Copyright (C) 2008 Collabora Limited </tp:copyright>
+ <tp:license xmlns="http://www.w3.org/1999/xhtml">
+ <p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.</p>
+
+<p>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 St, Fifth Floor, Boston, MA 02110-1301 USA</p>
+ </tp:license>
+ <interface name="org.laptop.Telepathy.View">
+
+ <method name="GetActivities">
+ <arg direction="out" name="activities" type="au">
+ <tp:docstring>
+ An array of room handles
+ </tp:docstring>
+ </arg>
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>Return all the activities of this view</p>
+ </tp:docstring>
+ <tp:possible-errors>
+ </tp:possible-errors>
+ </method>
+
+ <method name="GetBuddies">
+ <arg direction="out" name="buddies" type="au">
+ <tp:docstring>
+ An array of buddies handles
+ </tp:docstring>
+ </arg>
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>Return all the buddies of this view</p>
+ </tp:docstring>
+ <tp:possible-errors>
+ </tp:possible-errors>
+ </method>
+
+ <method name="Close">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>Close the view so we won't receive notifications about its
+ result anymore. Method calls on the view are no longer valid after
+ this call, and the connection manager may remove the object from
+ the bus at any point.</p>
+ </tp:docstring>
+ <tp:possible-errors>
+ </tp:possible-errors>
+ </method>
+
+ <signal name="ActivitiesChanged">
+ <arg name="added" type="au">
+ <tp:docstring>
+ Room handles of the added activities
+ </tp:docstring>
+ </arg>
+ <arg name="removed" type="au">
+ <tp:docstring>
+ Room handles of the removed activities
+ </tp:docstring>
+ </arg>
+ <tp:docstring>
+ Signal emitted when the activities in the view are changed.
+ </tp:docstring>
+ </signal>
+
+ <signal name="BuddiesChanged">
+ <arg name="added" type="au">
+ <tp:docstring>
+ Handles of the added buddies
+ </tp:docstring>
+ </arg>
+ <arg name="removed" type="au">
+ <tp:docstring>
+ Handles of the removed buddies
+ </tp:docstring>
+ </arg>
+ <tp:docstring>
+ Signal emitted when the buddies in the view are changed.
+ </tp:docstring>
+ </signal>
+
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>An object representing the result of an search.</p>
+ <p>Buddy properties changes are notified on the Connection object using the
+ <code>org.laptop.Telepathy.BuddyInfo</code> interface while the view object
+ is alive.</p>
+ <p>Activity properties changes are notified on the Connection object using the
+ <code>org.laptop.Telepathy.ActivityProperties</code> interface while the view object
+ is alive.</p>
+ <p>Activities membership is notified on the Connection object using the
+ <code>org.laptop.Telepathy.BuddyInfo</code> properties while the view object
+ is alive.</p>
+ </tp:docstring>
+ </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/all.xml b/extensions/all.xml
index abb03b8..8ad0fe8 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -28,8 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
<xi:include href="OLPC_Buddy_Info.xml"/>
<xi:include href="OLPC_Activity_Properties.xml"/>
<xi:include href="OLPC_Gadget.xml"/>
-<xi:include href="OLPC_Buddy_View.xml"/>
-<xi:include href="OLPC_Activity_View.xml"/>
+<xi:include href="OLPC_View.xml"/>
<tp:generic-types>
<tp:external-type name="Contact_Handle" type="u"
--
1.5.6.5
More information about the Telepathy-commits
mailing list