diff options
Diffstat (limited to 'src/jarabe/desktop')
-rw-r--r-- | src/jarabe/desktop/favoritesview.py | 10 | ||||
-rw-r--r-- | src/jarabe/desktop/homewindow.py | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 490e5c0..eccd517 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -522,16 +522,6 @@ class ActivityIcon(CanvasIcon): def _resume(self, journal_entry): if not journal_entry['activity_id']: journal_entry['activity_id'] = activityfactory.create_activity_id() - - shell_model = shell.get_model() - activity = shell_model.get_activity_by_id(journal_entry['activity_id']) - if activity: - activity.get_window().activate(gtk.get_current_event_time()) - return - - launcher.add_launcher(journal_entry['activity_id'], - self._activity_info.get_icon(), - misc.get_icon_color(journal_entry)) misc.resume(journal_entry, self._activity_info.get_bundle_id()) def _activate(self): diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py index 50fa70c..d830ed0 100644 --- a/src/jarabe/desktop/homewindow.py +++ b/src/jarabe/desktop/homewindow.py @@ -117,7 +117,10 @@ class HomeWindow(gtk.Window): def __map_event_cb(self, window, event): # have to make the desktop window active # since metacity doesn't make it on startup - self.window.focus() + timestamp = event.get_time() + if not timestamp: + timestamp = gtk.gdk.x11_get_server_time(self.window) + self.window.focus(timestamp) def __zoom_level_changed_cb(self, **kwargs): old_level = kwargs['old_level'] |