diff options
| author | Sayamindu Dasgupta <sayamindu@desktop.unmad.in> | 2008-06-04 18:15:42 (GMT) |
|---|---|---|
| committer | Sayamindu Dasgupta <sayamindu@desktop.unmad.in> | 2008-06-04 18:15:42 (GMT) |
| commit | 2b6e3b653dd3de53991e180ef390b6a2abaeaf1d (patch) | |
| tree | f2985943dc41c38a953ea993eea166f33bb2d70b /src/view | |
| parent | 9ac7db79d130893116bf3fc063b867f9c8cfcf4e (diff) | |
Fixed invocation of wnck.Window.Activate()
Diffstat (limited to 'src/view')
| -rw-r--r-- | src/view/ActivityHost.py | 6 | ||||
| -rw-r--r-- | src/view/Shell.py | 5 | ||||
| -rw-r--r-- | src/view/frame/activitiestray.py | 3 | ||||
| -rw-r--r-- | src/view/palettes.py | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/view/ActivityHost.py b/src/view/ActivityHost.py index 987a255..ef173eb 100644 --- a/src/view/ActivityHost.py +++ b/src/view/ActivityHost.py @@ -54,11 +54,7 @@ class ActivityHost: self._window.set_fullscreen(fullscreen) def present(self): - # wnck.Window.activate() expects a timestamp, but we don't - # always have one, and libwnck will complain if we pass "0", - # and matchbox doesn't look at the timestamp anyway. So we - # just always pass "1". - self._window.activate(1) + self._window.activate(gtk.get_current_event_time()) def close(self): # The "1" is a fake timestamp as with present() diff --git a/src/view/Shell.py b/src/view/Shell.py index f45923d..875e9a5 100644 --- a/src/view/Shell.py +++ b/src/view/Shell.py @@ -209,14 +209,15 @@ class Shell(gobject.GObject): previous_activity = home_model.get_previous_activity() if previous_activity: self.take_activity_screenshot() - previous_activity.get_window().activate(1) + previous_activity.get_window().activate( + gtk.get_current_event_time()) def activate_next_activity(self): home_model = self._model.get_home() next_activity = home_model.get_next_activity() if next_activity: self.take_activity_screenshot() - next_activity.get_window().activate(1) + next_activity.get_window().activate(gtk.get_current_event_time()) def close_current_activity(self): if self._model.get_zoom_level() != shellmodel.ShellModel.ZOOM_ACTIVITY: diff --git a/src/view/frame/activitiestray.py b/src/view/frame/activitiestray.py index bba1c54..020cb68 100644 --- a/src/view/frame/activitiestray.py +++ b/src/view/frame/activitiestray.py @@ -17,6 +17,7 @@ import logging from gettext import gettext as _ +import gtk from sugar.graphics import style from sugar.graphics.tray import HTray @@ -226,7 +227,7 @@ 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(1) + home_activity.get_window().activate(gtk.get_current_event_time()) def __invite_clicked_cb(self, icon, invite): self._invites.remove_invite(invite) diff --git a/src/view/palettes.py b/src/view/palettes.py index ae0ed4f..bda7f95 100644 --- a/src/view/palettes.py +++ b/src/view/palettes.py @@ -74,7 +74,7 @@ class CurrentActivityPalette(BasePalette): menu_item.show() def __resume_activate_cb(self, menu_item): - self._home_activity.get_window().activate(1) + self._home_activity.get_window().activate(gtk.get_current_event_time()) def __stop_activate_cb(self, menu_item): self._home_activity.get_window().close(1) @@ -179,7 +179,7 @@ class JournalPalette(BasePalette): menu_item.show() def __open_activate_cb(self, menu_item): - self._home_activity.get_window().activate(1) + self._home_activity.get_window().activate(gtk.get_current_event_time()) def __popup_cb(self, palette): # TODO: we should be able to ask the datastore this info, as that's the |