diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-07 11:22:29 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-07 11:22:29 (GMT) |
| commit | 6c55853ca71f52fd22310825c4a687dc4841a1e3 (patch) | |
| tree | 3126ef7096581ce30159e8ff1cb0e2be383d315e /src | |
| parent | 060ee03d19f8d395ff97bfe4f5a149e38ce3e082 (diff) | |
Make the launching activity active.
Diffstat (limited to 'src')
| -rw-r--r-- | src/model/homemodel.py | 2 | ||||
| -rw-r--r-- | src/view/Shell.py | 7 | ||||
| -rw-r--r-- | src/view/frame/activitiestray.py | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/model/homemodel.py b/src/model/homemodel.py index fa7a635..a75adcf 100644 --- a/src/model/homemodel.py +++ b/src/model/homemodel.py @@ -235,6 +235,8 @@ class HomeModel(gobject.GObject): home_activity.props.launching = True self._add_activity(home_activity) + self._set_active_activity(home_activity) + self.emit('launch-started', home_activity) # FIXME: better learn about finishing processes by receiving a signal. diff --git a/src/view/Shell.py b/src/view/Shell.py index 2750333..150392e 100644 --- a/src/view/Shell.py +++ b/src/view/Shell.py @@ -120,10 +120,11 @@ class Shell(gobject.GObject): del self._hosts[xid] def _active_activity_changed_cb(self, home_model, home_activity): + host = None if home_activity: - host = self._hosts[home_activity.get_xid()] - else: - host = None + xid = home_activity.get_xid() + if xid: + host = self._hosts[home_activity.get_xid()] if self._current_host: self._current_host.set_active(False) diff --git a/src/view/frame/activitiestray.py b/src/view/frame/activitiestray.py index 0566399..90be6e9 100644 --- a/src/view/frame/activitiestray.py +++ b/src/view/frame/activitiestray.py @@ -227,7 +227,9 @@ class ActivitiesTray(HTray): def __activity_clicked_cb(self, button, home_activity): if button.props.active: logging.debug('ActivitiesTray.__activity_clicked_cb') - home_activity.get_window().activate(gtk.get_current_event_time()) + window = home_activity.get_window() + if window: + window.activate(gtk.get_current_event_time()) def __invite_clicked_cb(self, icon, invite): self._invites.remove_invite(invite) |