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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Curtin (community) | Approve | ||
Michał Karnicki (community) | Approve | ||
Review via email:
|
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.
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): python2. 7/dist- packages/ ubuntuone- dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 277, in main get_suite( options) python2. 7/dist- packages/ ubuntuone- dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 173, in get_suite 'ignore- paths'] )) python2. 7/dist- packages/ ubuntuone- dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 157, in _collect_tests unittest( filepath) python2. 7/dist- packages/ ubuntuone- dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 98, in _load_unittest cache/ubuntuone -control- panel/trunk/ ubuntuone/ controlpanel/ dbustests/ __init_ _.py", line 28, in <module> controlpanel import dbus_service cache/ubuntuone -control- panel/trunk/ ubuntuone/ controlpanel/ dbus_service. py", line 22, in <module> python2. 7/dist- packages/ gi/importer. py", line 68, in load_module module. _load() python2. 7/dist- packages/ gi/module. py", line 291, in _load modules = __import_ _('gi.overrides ', fromlist= [self._ namespace] ) python2. 7/dist- packages/ gi/overrides/ GObject. py", line 533, in <module> python2. 7/dist- packages/ gi/overrides/ __init_ _.py", line 75, in override register( type_) python2. 7/dist- packages/ gi/overrides/ __init_ _.py", line 49, in register override_ class] = override_class python2. 7/dist- packages/ gi/overrides/ __init_ _.py", line 33, in __setitem__
File "/usr/bin/u1trial", line 40, in <module>
main()
File "/usr/lib/
suite = test_runner.
File "/usr/lib/
config[
File "/usr/lib/
module_suite = self._load_
File "/usr/lib/
module = __import__(modpath, None, None, [""])
File "/mnt/tarmac/
from ubuntuone.
File "/mnt/tarmac/
from gi.repository import GObject
File "/usr/lib/
dynamic_
File "/usr/lib/
overrides_
File "/usr/lib/
Object = override(Object)
File "/usr/lib/
registry.
File "/usr/lib/
self[
File "/usr/lib/
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