rpms/python-telepathy/FC-5 python-telepathy-connection-manager.patch, NONE, 1.1 python-telepathy.spec, 1.1, 1.2

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14566

Modified Files:
	python-telepathy.spec 
Added Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
- Patch for connection manager.


python-telepathy-connection-manager.patch:

--- NEW FILE python-telepathy-connection-manager.patch ---
--- telepathy/client/managerregistry.py~	2006-08-17 17:28:49.000000000 +0200
+++ telepathy/client/managerregistry.py	2006-10-02 19:42:47.000000000 +0200
@@ -21,20 +21,19 @@
 The registry of managers takes the form of any number of .manager files, which
 are searched for in /usr/share/telepathy/services or in ~/.telepathy.
 
-.manager files should have an initial stanza of the form:
+The name of a manager is the filename minus the .manager suffix
+For example a file named gabble.manager implies that:
+  The name of the connmgr is 'gabble'
+  The object path is /org/freedesktop/Telepathy/ConnectionManager/gabble
+  The bus name is org.freedesktop.Telepathy.ConnectionManager.gabble
+
+The object path and bus names are formed by replacing $name with the connmgr
+name in the following templates:
+  Object path: /org/freedesktop/Telepathy/ConnectionManager/$name
+  Bus name: org.freedesktop.Telepathy.ConnectionManager.$name
 
-[ConnectionManager]
-Name = value
-BusName = value
-ObjectPath = value
-
-
-where:
-'Name' field sets the name of connection manager.
-'BusName' sets the D-Bus bus name of this connection manager.
-'ObjectPath' sets the D-Bus object path to the ConnectionManager object under this service.
-
-Then any number of proctol support declarators of the form:
+.manager files should contain any number of proctol support declarators
+of the form:
 
 [Protocol (name of supported protocol)]
 param-(parameter name) = signature flags
@@ -86,16 +85,16 @@
     def LoadManager(self, path):
         config = ConfigParser.SafeConfigParser()
         config.read(path)
-        connection_manager = dict(config.items("ConnectionManager"))
-
-        if "name" not in connection_manager.keys():
-            raise ConfigParser.NoOptionError("name", "ConnectionManager")
 
-        cm_name = connection_manager["name"]
-        self.services[cm_name] = connection_manager
+        cm_name = os.path.basename(path)[:-len(".manager")]
+        self.services[cm_name] = {
+            "name": cm_name,
+            "busname": "org.freedesktop.Telepathy.ConnectionManager.%s" % cm_name,
+            "objectpath": "/org/freedesktop/Telepathy/ConnectionManager/%s" % cm_name,
+        }
         protocols = {}
 
-        for section in set(config.sections()) - set(["ConnectionManager"]):
+        for section in set(config.sections()):
             if section.startswith('Protocol '):
                 proto_name = section[len('Protocol '):]
                 protocols[proto_name] = dict(config.items(section))


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/FC-5/python-telepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-telepathy.spec	8 Sep 2006 13:08:24 -0000	1.1
+++ python-telepathy.spec	2 Oct 2006 19:04:07 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
+Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
+%patch0 -b .connection-manager
 
 
 %build
@@ -43,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
+- Patch for connection manager.
+
 * Sat Sep  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-1
 - Initial FE spec.