Merge lp:~ralsina/ubuntuone-control-panel/no-scroll-overlay into lp:ubuntuone-control-panel

[Roberto Alsina]

 - Prevented loading of the scrollbar overlay (Fix LP:1007421).

Manipulate GTK_MODULES so that the scrollbar overlay that breaks Qt apps is not loaded.

To test IRL, start u1cp on Quantal and see if you can see any devices or folders. If you can, the fix worked.

[dobey (dobey)]

Can you please add a comment why we're doing this here, and include the LP:BUGNO for the bug?

review: Needs Fixing

[Alejandro J. Cura (alecu)]

Please add tests, and move this code inside the main module.

review: Needs Fixing

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks good; tests pass on Precise and Windows 7.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-06-28 04:25:16 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-08-01 20:23:18 +0000
@@ -17,6 +17,7 @@
 """Provide the correct ui main module."""
 
 import argparse
+import os
 import sys
 
 from PyQt4 import QtCore
@@ -69,6 +70,15 @@
 
 def main(args, install_reactor_darwin=False):
     """Start the Qt mainloop and open the main window."""
+
+    # Disable the overlay-scrollbar GTK module that was
+    # added in Ubuntu 12.10 because it breaks Qt (LP:1007421)
+    gtk_mod = os.getenv('GTK_MODULES')
+    if gtk_mod is not None:
+        gtk_mod = ':'.join([mod for mod in
+            gtk_mod.split(':') if mod != 'overlay-scrollbar'])
+        os.environ['GTK_MODULES'] = gtk_mod
+
     # The following cannot be imported outside this function
     # because u1trial already provides a reactor.
 

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-06-28 04:14:08 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-08-01 20:23:18 +0000
@@ -16,6 +16,7 @@
 
 """Tests for the control panel's Qt main."""
 
+import os
 import sys
 
 from PyQt4 import QtCore
@@ -146,6 +147,32 @@
             (['ubuntuone-installer', sys.argv[0]],
             ('ubuntuone-control-panel',), {}))
 
+    def _test_gtk_module_cleanup(self, modules, expected):
+        """Check if the module cleanup works."""
+        old_modules = os.environ.get('GTK_MODULES', '')
+
+        def clean_env():
+            """Reset the environment variable."""
+            os.environ['GTK_MODULES'] = old_modules
+
+        self.addCleanup(clean_env)
+        os.environ['GTK_MODULES'] = modules
+        main.main([sys.argv[0]])
+        self.assertEqual(os.environ['GTK_MODULES'], expected)
+
+    def test_gtk_module_cleanup_1(self):
+        """Test that we deactivate the overlay scrollbar GTK module."""
+        self._test_gtk_module_cleanup('aaa:overlay-scrollbar:bbb', 'aaa:bbb')
+
+    def test_gtk_module_cleanup_2(self):
+        """Test that we deactivate the overlay scrollbar GTK module."""
+        self._test_gtk_module_cleanup('overlay-scrollbar', '')
+
+    def test_gtk_module_cleanup_3(self):
+        """Test that we deactivate the overlay scrollbar GTK module."""
+        self._test_gtk_module_cleanup('overlay-scrollbar:overlay-scrollbars',
+            'overlay-scrollbars')
+
     def test_title_not_fail(self):
         """Ensure -title is removed before it gets to argparse."""
         main.main([sys.argv[0], "-title"])