Merge lp:~osomon/moovida/shell into lp:moovida

[Olivier Tilloy]

[Olivier Tilloy (osomon)]

This fixes bug #496569 whereby, on recent linux distributions (shipping PyGTK >= 2.16), Moovida fails to start with the --shell option.

Note that this currently doesn't affect the windows version of Moovida as the current windows build includes PyGTK 2.14.2, and it doesn't ship IPython anyway.

The careful reviewer will make sure that the patch actually fixes the startup on e.g. Ubuntu Karmic, provides the developer an IPython shell, and doesn't introduce regressions on older distributions (e.g. Ubuntu Hardy).

Unmerged revisions

1607. By Olivier Tilloy on 2009-12-14

Switch off PyGTK's interactive event loop before starting IPython's own event loop
to avoid the two event loops interfering with each other.
This fixes the startup of Moovida with the --shell option with PyGTK >= 2.16.

=== modified file 'elisa-core/elisa/core/application.py'
--- elisa-core/elisa/core/application.py	2009-07-22 14:02:11 +0000
+++ elisa-core/elisa/core/application.py	2009-12-14 18:47:13 +0000
@@ -430,7 +430,22 @@
                         self.warning("IPython not available, --shell option " \
                                      "ignored")
                     else:
+                        # Starting from 2.16, PyGTK has an interactive event
+                        # loop. We need to switch it off before starting
+                        # IPython's own event loop to avoid the two event loops
+                        # interfering with each other, as is done in
+                        # IPython.Shell.IPShellGTK's __init__. See
+                        # https://bugs.launchpad.net/ipython/+bug/270856 for
+                        # details.
+                        import gtk
+                        try:
+                            gtk.set_interactive(False)
+                        except AttributeError:
+                            # PyGTK < 2.16
+                            pass
+
                         IPShellEmbed([])()
+
                 reactor.callInThread(start_shell)
             return result