diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-09-16 16:35:32 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-09-17 16:06:15 (GMT) |
| commit | 9a0b3b51888f4ddfe834bd093b6147b3ea1bd7ec (patch) | |
| tree | bc2d080ba043686bc74c720b7ca5c7d33c8f5b5d /src/jarabe/frame/activitiestray.py | |
| parent | 0b95b36d85e08a4df3a63c78f1cf8b549f06a5fa (diff) | |
Properly store and load friends #2331
Because FriendBuddyModel has a different life cycle than BuddyModel
(are tracked also when online), we need to store the key and nick
so we can represent them in the UI when the contact are not online
and also so we can relate to the contact when it becomes online.
* src/jarabe/model/buddy.py: Move out FriendBuddyModel and add a
handle property to BuddyModel.
* src/jarabe/model/filetransfer.py: Ask neighborhood.py for the
buddy associated to a handle.
* src/jarabe/model/friends.py: Add FriendBuddyModel.
* src/jarabe/model/neighborhood.py: Set the contact handle on the
BuddyModel.
Diffstat (limited to 'src/jarabe/frame/activitiestray.py')
| -rw-r--r-- | src/jarabe/frame/activitiestray.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 9a1a9da..6bd2a1b 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -371,7 +371,7 @@ class IncomingTransferButton(BaseTransferButton): self.notif_icon.props.icon_name = icon_name break - icon_color = XoColor(file_transfer.buddy.props.color) + icon_color = file_transfer.buddy.props.color self.props.icon_widget.props.xo_color = icon_color self.notif_icon.props.xo_color = icon_color @@ -396,7 +396,7 @@ class IncomingTransferButton(BaseTransferButton): self._ds_object.metadata['buddies'] = '' self._ds_object.metadata['preview'] = '' self._ds_object.metadata['icon-color'] = \ - file_transfer.buddy.props.color + file_transfer.buddy.props.color.to_string() self._ds_object.metadata['mime_type'] = file_transfer.mime_type elif file_transfer.props.state == filetransfer.FT_STATE_COMPLETED: logging.debug('__notify_state_cb COMPLETED') |