From c8fe5f59b2834f77e70340d53de711b3e789dd6d Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Mon, 17 Feb 2014 13:39:42 -0500
Subject: ConnectionManager: Add "account-path-suffix" well-known parameter

---
 spec/Connection_Manager.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index ada5057d..9dba835c 100644
--- a/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
@@ -453,6 +453,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
               allowed; new connection managers SHOULD implement it in
               preference to this one.</p>
           </dd>
+
+          <dt>account-path-suffix (s)</dt>
+          <dd>The suffix of the Connection's Account object-path such as
+          "gabble/jabber/chris_40example_2ecom0" for the account whose
+          object path is "/org/freedesktop/Telepathy/Account/gabble/jabber/chris_40example_2ecom0".
+          This parameter should be set by the AccountManager on CMs supporting
+          this parameter.</dd>
         </dl>
 
         <p>The following well-known parameter names correspond to D-Bus
-- 
cgit v1.2.3


From 5268e71e5c749f847b6ba33cc396ebfb0e83cb8e Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 7 Jan 2014 14:29:01 +0000
Subject: X-TELEPATHY-PASSWORD is not mandatory if unimplementable

Gabble (correctly) doesn't implement it if you use
{ "account": "gmail.com" }, which is not enough for X-TELEPATHY-PASSWORD:
a mechanism that provides a username, such as PLAIN or Google's OAuth
dialect, must be used here.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64354
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
---
 spec/Channel_Interface_SASL_Authentication.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/Channel_Interface_SASL_Authentication.xml b/spec/Channel_Interface_SASL_Authentication.xml
index 7985a6bd..6be975f7 100644
--- a/spec/Channel_Interface_SASL_Authentication.xml
+++ b/spec/Channel_Interface_SASL_Authentication.xml
@@ -125,8 +125,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <p>To make it possible to implement a very simple password-querying
           user interface without knowledge of any particular SASL mechanism,
           implementations of this interface MUST implement the
-          pseudo-mechanism <code>X-TELEPATHY-PASSWORD</code>, unless none
-          of the available mechanisms use a password at all.</p>
+          pseudo-mechanism <code>X-TELEPATHY-PASSWORD</code>, unless each
+          of the available mechanisms either requires additional information
+          beyond the password (such as a username), or does not use a
+          password.</p>
       </tp:docstring>
     </property>
 
-- 
cgit v1.2.3