diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-01-31 14:43:55 -0500 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-01-31 14:43:55 -0500 |
| commit | 56197d54c25a6f377153532fe9d4bcfb853ab34f (patch) | |
| tree | 2b28e9528bc7e5f5a592375b7fe95ab6db5846b1 | |
| parent | 09d635c2db892790040bf94de1fa084a9571f61a (diff) | |
| parent | 1d6f4c990d2d1c3b0b4e815f902f480ba1b9b21a (diff) | |
Merge branch 'next' into smcv/next
Conflicts:
spec/Channel_Interface_Group.xml
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | spec/Channel_Interface_Group.xml | 12 | ||||
| -rw-r--r-- | spec/all.xml | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group.xml index 27f4872b..fc40839e 100644 --- a/spec/Channel_Interface_Group.xml +++ b/spec/Channel_Interface_Group.xml @@ -188,7 +188,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> </tp:flag> - <tp:flag suffix="Message_Depart" value="8192"> + <tp:flag suffix="Message_Depart" value="2048"> <tp:added version="0.17.21"/> <tp:docstring> A message may be sent to the server when calling @@ -300,8 +300,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring> The members of this channel. </tp:docstring> - <tp:added version="0.17.6">If Channel_Group_Flag_Properties - is not set, fall back to calling GetAllMembers.</tp:added> + <tp:added version="0.17.6"/> </property> <property name="RemotePendingMembers" access="read" type="au" @@ -310,8 +309,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ An array of handles representing contacts who have been invited to the channel and are awaiting remote approval. </tp:docstring> - <tp:added version="0.17.6">If Channel_Group_Flag_Properties - is not set, fall back to calling GetAllMembers.</tp:added> + <tp:added version="0.17.6"/> </property> <signal name="SelfContactChanged" tp:name-for-bindings="Self_Contact_Changed"> @@ -810,8 +808,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ their request before they may join. A single contact should never appear on more than one of the three lists. The lists are empty when the channel is created, and the <tp:member-ref>MembersChanged</tp:member-ref> signal - should be emitted when information - is retrieved from the server, or changes occur.</p> + should be emitted when information is retrieved from the server, + or changes occur.</p> <p>If the <tp:member-ref>MembersChanged</tp:member-ref> signal indicates that the <tp:member-ref>SelfHandle</tp:member-ref> has been removed from diff --git a/spec/all.xml b/spec/all.xml index 5ed55cdf..fbb10499 100644 --- a/spec/all.xml +++ b/spec/all.xml @@ -83,9 +83,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Connection_Interface_Contact_Capabilities.xml"/> <xi:include href="Connection_Interface_Contact_Info.xml"/> <xi:include href="Connection_Interface_Location.xml"/> + <xi:include href="Connection_Interface_Presence.xml"/> <xi:include href="Connection_Interface_Renaming.xml"/> <xi:include href="Connection_Interface_Resources.xml"/> - <xi:include href="Connection_Interface_Presence.xml"/> </tp:section> <tp:section name="Connection feature interfaces"> |