sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace _connect_to_server with a protocol/cm independent equivalent

Browse Source
This commit is contained in:
Guillaume Desmottes 2007-02-24 00:39:54 +01:00
parent 6a58df67a0
commit 4200f1edeb
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
services/presence2/presenceservice.py
View File

@ -60,7 +60,12 @@ class PresenceService(dbus.service.Object):
self._registry = ManagerRegistry() self._registry = ManagerRegistry()
self._registry.LoadManagers() self._registry.LoadManagers()
self._server_client = self._connect_to_server() account = {
'account': 'olpc@collabora.co.uk',
'password': 'learn',
'server': 'light.bluelinux.co.uk'
}
self._server_client = self._connect_to_connection_manager("jabber", account)
self._handles[self._server_client] = {} self._handles[self._server_client] = {}
# Telepathy link local connection # Telepathy link local connection
@ -72,15 +77,13 @@ class PresenceService(dbus.service.Object):
dbus.service.Object.__init__(self, self._bus_name, _PRESENCE_PATH) dbus.service.Object.__init__(self, self._bus_name, _PRESENCE_PATH)
def _connect_to_server(self): def _connect_to_connection_manager(self, protocol, account):
protocol = 'jabber' if protocol == "jabber":
account = { cm = "gabble"
'account': 'olpc@collabora.co.uk', else:
'password': 'learn', return
'server': 'light.bluelinux.co.uk'
}
mgr = self._registry.GetManager('gabble') mgr = self._registry.GetManager(cm)
conn = None conn = None
# Search existing connections, if any, that we might be able to use # Search existing connections, if any, that we might be able to use
@ -88,7 +91,7 @@ class PresenceService(dbus.service.Object):
for item in connections: for item in connections:
if item[CONN_INTERFACE].GetProtocol() != protocol: if item[CONN_INTERFACE].GetProtocol() != protocol:
continue continue
if not item.object_path.startswith("/org/freedesktop/Telepathy/Connection/gabble/jabber/"): if not item.object_path.startswith("/org/freedesktop/Telepathy/Connection/%s/%s/" % (cm, protocol)):
continue continue
if item[CONN_INTERFACE].GetStatus() == CONNECTION_STATUS_CONNECTED: if item[CONN_INTERFACE].GetStatus() == CONNECTION_STATUS_CONNECTED:
self_name = account['account'] self_name = account['account']