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

Fix for removing activity from donut when not the active and the last one

Browse Source
This commit is contained in:
Simon Schampijer 2007-09-07 17:39:42 +02:00
parent 204661329b
commit 5766522f53
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/model/homemodel.py
View File

@ -201,7 +201,9 @@ class HomeModel(gobject.GObject):
def _remove_activity(self, home_activity): def _remove_activity(self, home_activity):
if home_activity == self._active_activity: if home_activity == self._active_activity:
self._set_active_activity(None) self._set_active_activity(None)
# Figure out the new _pending_activity.
if home_activity == self._pending_activity:
# Figure out the new _pending_activity
windows = wnck.screen_get_default().get_windows_stacked() windows = wnck.screen_get_default().get_windows_stacked()
windows.reverse() windows.reverse()
for window in windows: for window in windows:
@ -209,13 +211,13 @@ class HomeModel(gobject.GObject):
if new_activity is not None: if new_activity is not None:
self._set_pending_activity(new_activity) self._set_pending_activity(new_activity)
break break
else: else:
logging.error('No activities are running') logging.error('No activities are running')
self._set_pending_activity(None) self._set_pending_activity(None)
self.emit('activity-removed', home_activity) self.emit('activity-removed', home_activity)
self._activities.remove(home_activity) self._activities.remove(home_activity)
def _remove_activity_by_xid(self, xid): def _remove_activity_by_xid(self, xid):
home_activity = self._get_activity_by_xid(xid) home_activity = self._get_activity_by_xid(xid)
if home_activity: if home_activity: