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

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-10-23 15:19:34 +02:00
commit 7fd05154d3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,3 +1,5 @@
* #4238: Handle double BuddyLeft in handle tracking in sugar.presence (morgs)
Snapshot 57402cf309 Snapshot 57402cf309
* Add new keybindings (Ctrl+Q, Ctrl+escape) for close activity (erikos) * Add new keybindings (Ctrl+Q, Ctrl+escape) for close activity (erikos)

1
lib/sugar/activity/activity.py
View File

@ -586,7 +586,6 @@ class Activity(Window, gtk.Container):
Once the activity is shared, its privacy can be changed by setting Once the activity is shared, its privacy can be changed by setting
its 'private' property. its 'private' property.
""" """
# FIXME: Make private=True to turn on the by-invitation-only scope
if self._shared_activity and self._shared_activity.props.joined: if self._shared_activity and self._shared_activity.props.joined:
raise RuntimeError("Activity %s already shared." % raise RuntimeError("Activity %s already shared." %
self._activity_id) self._activity_id)

5
lib/sugar/presence/activity.py
View File

@ -203,8 +203,9 @@ class Activity(gobject.GObject):
def _buddy_left_cb(self, object_path): def _buddy_left_cb(self, object_path):
_logger.debug('%r: buddy %s left', self, object_path) _logger.debug('%r: buddy %s left', self, object_path)
gobject.idle_add(self._emit_buddy_left_signal, object_path) gobject.idle_add(self._emit_buddy_left_signal, object_path)
handle = self._buddy_path_to_handle.pop(object_path) handle = self._buddy_path_to_handle.pop(object_path, None)
self._handle_to_buddy_path.pop(handle, None) if handle:
self._handle_to_buddy_path.pop(handle, None)
def _emit_new_channel_signal(self, object_path): def _emit_new_channel_signal(self, object_path):
"""Generate new-channel GObject signal with channel object path """Generate new-channel GObject signal with channel object path