From bc0455c5123bf257ac2bbbaecf55f93e0dba10f8 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 29 Sep 2009 18:39:21 +0000
Subject: Present windows in non-active process #1423

---
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 8955313..e7f62a2 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -67,7 +67,7 @@ class DeviceView(TrayIcon):
     def __button_release_event_cb(self, widget, event):
         journal = journalactivity.get_journal()
         journal.set_active_volume(self._mount)
-        journal.present()
+        journal.reveal()
         return True
 
 def setup(tray):
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 852d407..7dbef28 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -67,11 +67,7 @@ class JournalActivityDBusService(dbus.service.Object):
         logging.debug('Trying to show object %s', object_id)
 
         if self._parent.show_object(object_id):
-            self._parent.present()
-            if self._parent.window is not None:
-                # have to use gdk level, looks like metacity
-                # doesn't raise windows from non-icon state, see #1339
-                self._parent.window.focus()
+            self._parent.reveal()
 
     def _chooser_response_cb(self, chooser, response_id, chooser_id):
         logging.debug('JournalActivityDBusService._chooser_response_cb')
@@ -330,7 +326,7 @@ class JournalActivity(Window):
 
     def __alert_closed_cb(self, data):
         self.show_main_view()
-        self.present()
+        self.reveal()
         self._critical_space_alert = None
 
     def set_active_volume(self, mount):
@@ -339,7 +335,7 @@ class JournalActivity(Window):
     def focus_search(self):
         """Become visible and give focus to the search entry
         """
-        self.present()
+        self.reveal()
         self.show_main_view()
         self.search_grab_focus()
 
--
cgit v0.9.1