From c7b8ba61ecc9f0102d8bc49c7fda1e65c8631e74 Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Mon, 7 Nov 2011 16:58:33 +1100
Subject: [PATCH] RoomConfig.PasswordHint

A hint for the room password.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=42653
---
 spec/Channel_Interface_Password.xml    |    7 +++++++
 spec/Channel_Interface_Room_Config.xml |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password.xml
index 8aec200..57991aa 100644
--- a/spec/Channel_Interface_Password.xml
+++ b/spec/Channel_Interface_Password.xml
@@ -29,6 +29,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           called now for the user to join the channel
         </tp:docstring>
       </tp:flag>
+      <tp:flag suffix="Hint" value="4">
+        <tp:added version="UNRELEASED"/>
+        <tp:docstring>
+          The <tp:dbus-ref namespace="ofdT.Channel.Interface">RoomConfig1.PasswordHint</tp:dbus-ref>
+          contains a hint for the password.
+        </tp:docstring>
+      </tp:flag>
     </tp:flags>
     <method name="GetPasswordFlags" tp:name-for-bindings="Get_Password_Flags">
       <arg direction="out" type="u" tp:type="Channel_Password_Flags"
diff --git a/spec/Channel_Interface_Room_Config.xml b/spec/Channel_Interface_Room_Config.xml
index 2ae7f1f..4ceec3f 100644
--- a/spec/Channel_Interface_Room_Config.xml
+++ b/spec/Channel_Interface_Room_Config.xml
@@ -132,6 +132,25 @@
       </tp:docstring>
     </property>
 
+    <property name="PasswordHint" tp:name-for-bindings="Password_Hint"
+              type="s" access="read">
+      <tp:added version="UNRELEASED"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>If <tp:member-ref>PasswordProtected</tp:member-ref> is
+          <code>True</code>, an optional hint for the password.</p>
+
+        <p>On protocols supporting PasswordHint (indicated by its presence
+          in <tp:member-ref>MutableProperties</tp:member-ref>),
+          <tp:member-ref>Password</tp:member-ref> and PasswordHint MUST be
+          set in a single call to
+          <tp:member-ref>UpdateConfiguration</tp:member-ref>.</p>
+
+        <tp:rationale>
+          Skype requires that the password and its hint be supplied together.
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
     <property name="CanUpdateConfiguration" type="b" access="read"
               tp:name-for-bindings="Can_Update_Configuration">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-- 
1.7.5.4