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

---
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 9c9fde8..d4892d0 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -420,9 +420,7 @@ class Activity(Window, gtk.Container):
     def __session_quit_requested_cb(self, session):
         self._quit_requested = True
 
-        if not self._prepare_close():
-            session.will_quit(self, False)
-        elif not self._updating_jobject:
+        if self._prepare_close() and not self._updating_jobject:
             session.will_quit(self, True)
 
     def __session_quit_cb(self, client):
@@ -649,7 +647,7 @@ class Activity(Window, gtk.Container):
             logging.debug('Failed to join activity: %s', err)
             return
 
-        self.present()
+        self.reveal()
         self.emit('joined')
         self.__privacy_changed_cb(self.shared_activity, None)
 
@@ -749,12 +747,16 @@ class Activity(Window, gtk.Container):
         self.add_alert(alert)
         alert.connect('response', self._keep_failed_dialog_response_cb)
 
-        self.present()
+        self.reveal()
 
     def _keep_failed_dialog_response_cb(self, alert, response_id):
         self.remove_alert(alert)
         if response_id == gtk.RESPONSE_OK:
             self.close(skip_save=True)
+            if self._quit_requested:
+                self._session.will_quit(self, True)
+        elif self._quit_requested:
+            self._session.will_quit(self, False)
 
     def can_close(self):
         """Activities should override this function if they want to perform
@@ -809,7 +811,7 @@ class Activity(Window, gtk.Container):
             title_alert = NamingAlert(self, get_bundle_path())
             title_alert.set_transient_for(self.get_toplevel())
             title_alert.show()
-            self.present()
+            self.reveal()
 
     def __realize_cb(self, window):
         wm.set_bundle_id(window.window, self.get_bundle_id())
diff --git a/src/sugar/graphics/window.py b/src/sugar/graphics/window.py
index 967217a..885877d 100644
--- a/src/sugar/graphics/window.py
+++ b/src/sugar/graphics/window.py
@@ -118,6 +118,21 @@ class Window(gtk.Window):
             self.__unfullscreen_button_pressed)
         self._unfullscreen_button_timeout_id = None
 
+    def reveal(self):
+        """ Make window active
+
+        In contrast with present(), brings window to the top
+        even after invoking on response on non-gtk events.
+        See #1423.
+        """
+        if self.window is None:
+            self.show()
+            return
+        timestamp = gtk.get_current_event_time()
+        if not timestamp:
+            timestamp = gtk.gdk.x11_get_server_time(self.window)
+        self.window.focus(timestamp)
+
     def fullscreen(self):
         palettegroup.popdown_all()
         if self._toolbar_box is not None:
--
cgit v0.9.1