Merge lp:~elopio/gallery-app/workaround1324556-get_header into lp:gallery-app

Proposed by Leo Arias
Status: Rejected
Rejected by: Bill Filler
Proposed branch: lp:~elopio/gallery-app/workaround1324556-get_header
Merge into: lp:gallery-app
Diff against target: 31 lines (+16/-2)
1 file modified
tests/autopilot/gallery_app/emulators/main_screen.py (+16/-2)
To merge this branch: bzr merge lp:~elopio/gallery-app/workaround1324556-get_header
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+221415@code.launchpad.net

Commit message

Added a workaround for bug 1324556.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

The proper fix has already landed on the toolkit.

Unmerged revisions

990. By Leo Arias

Added a workaround for bug 1324556.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/gallery_app/emulators/main_screen.py'
--- tests/autopilot/gallery_app/emulators/main_screen.py 2014-04-01 19:18:50 +0000
+++ tests/autopilot/gallery_app/emulators/main_screen.py 2014-05-29 15:44:23 +0000
@@ -5,11 +5,25 @@
5# under the terms of the GNU General Public License version 3, as published5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.6# by the Free Software Foundation.
77
8from ubuntuuitoolkit import emulators as toolkit_emulators8
9import ubuntuuitoolkit
10
9from gallery_app.emulators import toolbar11from gallery_app.emulators import toolbar
1012
1113
12class MainScreen(toolkit_emulators.MainView):14# XXX workaround for bug http://pad.lv/1324556
15# This is really ugly. A proper fix is in progress and should land with the
16# next toolkit release. --elopio - 2014-05-29
17
18ubuntuuitoolkit.Header.__init__ = lambda *args: fixed_init(*args)
19
20def fixed_init(instance, *args):
21 ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase.__init__(
22 instance, *args)
23 instance.main_view = instance.get_root_instance().select_single(MainScreen)
24
25
26class MainScreen(ubuntuuitoolkit.MainView):
13 """An emulator class that makes it easy to interact with the gallery app"""27 """An emulator class that makes it easy to interact with the gallery app"""
1428
15 def get_toolbar(self):29 def get_toolbar(self):

Subscribers

People subscribed via source and target branches

to all changes: