diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-31 15:01:27 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-31 16:03:04 +0000 |
| commit | 3cb555408a3d0077b9ddb2c9a5e40876538ea6b8 (patch) | |
| tree | 7467a409cdde138a7a98c88c5ebed53ec035d941 | |
| parent | 93ecf498f496428f1e938348f5f3ac97a4cd3b40 (diff) | |
Version the contents of .manager files, too
The .client files are already versioned by using the interface name as
group name, but the .manager files aren't. It's either this or use a
versioned directory (I could go either way).
| -rw-r--r-- | spec/Connection_Manager.xml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml index 31338551..dc5f17aa 100644 --- a/spec/Connection_Manager.xml +++ b/spec/Connection_Manager.xml @@ -482,7 +482,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ colon-separated paths from $XDG_DATA_DIRS, defaulting to /usr/local/share:/usr/share if unset) for the first file named <code>telepathy/managers/<em>cmname</em>.manager</code> that can be - read without error. This file has the same syntax as a + read without error and contains a group whose name is the name of this + interface. This file has the same syntax as a <a href="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html">freedesktop.org Desktop Entry file</a>.</p> <p>Clients must still support connection managers for which no @@ -493,26 +494,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ a plugin architecture) should not install a <code>.manager</code> file.</p> - <p>The <code>.manager</code> file SHOULD have a group headed - <code>[ConnectionManager]</code>, containing a key + <p>The <code>.manager</code> file MUST have a group headed + <code>[im.telepathy1.ConnectionManager]</code>, containing a key <code>Interfaces</code> representing <tp:member-ref>Interfaces</tp:member-ref> as a sequence of strings each followed by a semicolon (the "localestrings" type from the Desktop Entry Specification).</p> - <p>The <code>[ConnectionManager]</code> group SHOULD NOT contain keys - <code>ObjectPath</code> or <code>BusName</code>. If it does, they MUST - be ignored.</p> - - <tp:rationale> - <p>The object path and bus name are derivable from the connection - manager's name, which is part of the filename, so these keys are - redundant. They were required in very old versions of Telepathy.</p> - </tp:rationale> - <p>For each protocol name <em>proto</em> that would be returned by the keys of the <tp:member-ref>Protocols</tp:member-ref> property, - the .manager file contains a group headed <code>[Protocol + the .manager file contains a group headed <code>[im.telepathy1.Protocol <em>proto</em>]</code>. For each parameter <em>p</em> that would be in the <tp:dbus-ref namespace="imt1.Protocol">Parameters</tp:dbus-ref> property |