diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-01 09:03:18 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-01 09:03:18 (GMT) |
| commit | 2f6790105df59090abefff8047aa412d659d5cfb (patch) | |
| tree | 8594775b0a891b2b98bb8d70de4ded31e058ad7a /shell/model/homemodel.py | |
| parent | e1f27fcd3498540720e9548946891b4db61be822 (diff) | |
Make launching a property of the activity model
Diffstat (limited to 'shell/model/homemodel.py')
| -rw-r--r-- | shell/model/homemodel.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/model/homemodel.py b/shell/model/homemodel.py index b2329b4..df32db3 100644 --- a/shell/model/homemodel.py +++ b/shell/model/homemodel.py @@ -43,10 +43,10 @@ class HomeModel(gobject.GObject): the activity factories have set up. """ __gsignals__ = { - 'activity-launched': (gobject.SIGNAL_RUN_FIRST, + 'activity-added': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'activity-added': (gobject.SIGNAL_RUN_FIRST, + 'activity-started': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), 'activity-removed': (gobject.SIGNAL_RUN_FIRST, @@ -219,10 +219,12 @@ class HomeModel(gobject.GObject): return activity = HomeActivity(bundle, act_id) self._activities[act_id] = activity + self.emit('activity-added', activity) activity.set_service(service) activity.set_window(window) - self.emit('activity-added', activity) + + self.emit('activity-started', activity) def _internal_remove_activity(self, activity): if activity == self._current_activity: @@ -244,8 +246,9 @@ class HomeModel(gobject.GObject): if not bundle: raise ValueError("Activity service name '%s' was not found in the bundle registry." % service_name) activity = HomeActivity(bundle, activity_id) + activity.props.launching = True self._activities[activity_id] = activity - self.emit('activity-launched', activity) + self.emit('activity-added', activity) def notify_activity_launch_failed(self, activity_id): if self._activities.has_key(activity_id): |