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-01 16:50:38 +02:00
commit ed40d65791
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,3 +1,4 @@
* #3181 Show always myself in friendstray (erikos)
* #948 Fix passphrase encoding for some passphrases. (bertf) * #948 Fix passphrase encoding for some passphrases. (bertf)
* #948 Accept ascii passphrases for WEP networks. '$:1a2b3c4d' for hex keys, * #948 Accept ascii passphrases for WEP networks. '$:1a2b3c4d' for hex keys,
's:my passphrase' for 5 or 13 characters ascii passphrases, or just the plain 's:my passphrase' for 5 or 13 characters ascii passphrases, or just the plain

30
shell/view/frame/friendstray.py
View File

@ -47,12 +47,14 @@ class FriendsTray(VTray):
self._pservice.connect('activity-appeared', self._pservice.connect('activity-appeared',
self.__activity_appeared_cb) self.__activity_appeared_cb)
self._owner = self._pservice.get_owner()
# Add initial activities the PS knows about # Add initial activities the PS knows about
self._pservice.get_activities_async(reply_handler=self._get_activities_cb) self._pservice.get_activities_async(reply_handler=self._get_activities_cb)
home_model = shell.get_model().get_home() home_model = shell.get_model().get_home()
home_model.connect('active-activity-changed', home_model.connect('pending-activity-changed',
self._active_activity_changed_cb) self._pending_activity_changed_cb)
def _get_activities_cb(self, list): def _get_activities_cb(self, list):
for activity in list: for activity in list:
@ -85,9 +87,9 @@ class FriendsTray(VTray):
def __activity_appeared_cb(self, pservice, activity_ps): def __activity_appeared_cb(self, pservice, activity_ps):
activity = self._shell.get_current_activity() activity = self._shell.get_current_activity()
if activity and activity_ps.props.id == activity.get_id(): if activity and activity_ps.props.id == activity.get_id():
self._set_activity_ps(activity_ps) self._set_activity_ps(activity_ps, True)
def _set_activity_ps(self, activity_ps): def _set_activity_ps(self, activity_ps, shared_activity):
if self._activity_ps == activity_ps: if self._activity_ps == activity_ps:
return return
@ -102,7 +104,7 @@ class FriendsTray(VTray):
self.clear() self.clear()
if activity_ps != None: if shared_activity is True:
for buddy in activity_ps.get_joined_buddies(): for buddy in activity_ps.get_joined_buddies():
self.add_buddy(buddy) self.add_buddy(buddy)
@ -110,28 +112,28 @@ class FriendsTray(VTray):
'buddy-joined', self.__buddy_joined_cb) 'buddy-joined', self.__buddy_joined_cb)
self._left_hid = activity_ps.connect( self._left_hid = activity_ps.connect(
'buddy-left', self.__buddy_left_cb) 'buddy-left', self.__buddy_left_cb)
else:
# only display myself if not shared
self.add_buddy(self._owner)
def _active_activity_changed_cb(self, home_model, home_activity): def _pending_activity_changed_cb(self, home_model, home_activity):
if not home_activity: if home_activity is None:
self._set_activity_ps(None)
return return
activity_id = home_activity.get_activity_id() activity_id = home_activity.get_activity_id()
if not activity_id: if activity_id is None:
self._set_activity_ps(None)
return return
# HACK to suppress warning in logs when activity isn't found # check if activity is shared
# (if it's locally launched and not shared yet)
activity = None activity = None
for act in self._pservice.get_activities(): for act in self._pservice.get_activities():
if activity_id == act.props.id: if activity_id == act.props.id:
activity = act activity = act
break break
if activity: if activity:
self._set_activity_ps(activity) self._set_activity_ps(activity, True)
else: else:
self._set_activity_ps(None) self._set_activity_ps(home_activity, False)
def __buddy_joined_cb(self, activity, buddy): def __buddy_joined_cb(self, activity, buddy):
self.add_buddy(buddy) self.add_buddy(buddy)