Merge lp://qastaging/~mikemc/ubuntuone-control-panel/loading-overlay-snoozebar into lp://qastaging/ubuntuone-control-panel

Proposed by Mike McCracken
Status: Merged
Approved by: dobey
Approved revision: 394
Merged at revision: 395
Proposed branch: lp://qastaging/~mikemc/ubuntuone-control-panel/loading-overlay-snoozebar
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 32 lines (+12/-2)
2 files modified
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+5/-2)
ubuntuone/controlpanel/gui/qt/tests/test_loadingoverlay.py (+7/-0)
To merge this branch: bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/loading-overlay-snoozebar
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Michał Karnicki (community) Approve
Review via email: mp+145042@code.qastaging.launchpad.net

Commit message

- Kill animation timer when hiding loading overlay.

Description of the change

- Kill animation timer when hiding loading overlay.

If we don't do this, the timer fires every 200ms forever.

To post a comment you must log in.
Revision history for this message
Michał Karnicki (karni) :
review: Approve
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~mikemc/ubuntuone-control-panel/loading-overlay-snoozebar into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
Falling back to glib2reactor module.

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 40, in <module>
    main()
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 277, in main
    suite = test_runner.get_suite(options)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 173, in get_suite
    config['ignore-paths']))
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 157, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 98, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/dbustests/__init__.py", line 28, in <module>
    from ubuntuone.controlpanel import dbus_service
  File "/mnt/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/dbus_service.py", line 22, in <module>
    from gi.repository import GObject
  File "/usr/lib/python2.7/dist-packages/gi/importer.py", line 68, in load_module
    dynamic_module._load()
  File "/usr/lib/python2.7/dist-packages/gi/module.py", line 291, in _load
    overrides_modules = __import__('gi.overrides', fromlist=[self._namespace])
  File "/usr/lib/python2.7/dist-packages/gi/overrides/GObject.py", line 533, in <module>
    Object = override(Object)
  File "/usr/lib/python2.7/dist-packages/gi/overrides/__init__.py", line 75, in override
    registry.register(type_)
  File "/usr/lib/python2.7/dist-packages/gi/overrides/__init__.py", line 49, in register
    self[override_class] = override_class
  File "/usr/lib/python2.7/dist-packages/gi/overrides/__init__.py", line 33, in __setitem__
    raise TypeError('Can not override a type %s, which is not in a gobject introspection typelib' % value.__name__)
TypeError: Can not override a type Object, which is not in a gobject introspection typelib

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches