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

Pass the account path to the Activity on creation

Browse Source
This commit is contained in:
Tomeu Vizoso 2010-07-13 12:15:43 +02:00
parent 1a4c721f3d
commit 46159e987b
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sugar/presence/presenceservice.py
View File

@ -36,7 +36,8 @@ from sugar.presence.util import get_connection_manager
from telepathy.interfaces import ACCOUNT, \
ACCOUNT_MANAGER, \
CONNECTION
from telepathy.constants import HANDLE_TYPE_CONTACT
from telepathy.constants import HANDLE_TYPE_CONTACT, \
HANDLE_TYPE_ROOM
_logger = logging.getLogger('sugar.presence.presenceservice')
@ -263,14 +264,16 @@ class PresenceService(gobject.GObject):
'instance')
return self._activity_cache
else:
for connection in get_connection_manager().connections:
try:
room_handle = connection.GetActivity(activity_id)
activity = Activity(connection, room_handle)
self._activity_cache = activity
return activity
except:
pass
connection_manager = get_connection_manager()
connections_per_account = connection_manager.get_connections_per_account()
for account_path, connection in connections_per_account.items():
room_handles = connection.RequestHandles(HANDLE_TYPE_ROOM,
[activity_id],
dbus_interface=CONNECTION)
activity = Activity(account_path, connection,
room_handle=room_handles[0])
self._activity_cache = activity
return activity
return None

6
src/sugar/presence/util.py
View File

@ -47,10 +47,8 @@ class ConnectionManager(object):
def get_connection(self, account_path):
return self._connections_per_account[account_path]
def get_connections(self):
return self._connections_per_account.values()
connections = property(get_connections)
def get_connections_per_account(self):
return self._connections_per_account
_connection_manager = None