Merge lp://qastaging/~nataliabidart/ubuntu-sso-client/gtk-gi into lp://qastaging/ubuntu-sso-client
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||||||
Approved revision: | 862 | ||||||||
Merged at revision: | 843 | ||||||||
Proposed branch: | lp://qastaging/~nataliabidart/ubuntu-sso-client/gtk-gi | ||||||||
Merge into: | lp://qastaging/ubuntu-sso-client | ||||||||
Prerequisite: | lp://qastaging/~alecu/ubuntu-sso-client/use-restful-client | ||||||||
Diff against target: |
2630 lines (+720/-500) 32 files modified
data/gtk/ui.glade (+314/-180) run-tests (+13/-15) ubuntu_sso/account.py (+7/-3) ubuntu_sso/gtk/__init__.py (+1/-3) ubuntu_sso/gtk/gui.py (+90/-60) ubuntu_sso/gtk/main.py (+5/-3) ubuntu_sso/gtk/tests/__init__.py (+1/-3) ubuntu_sso/gtk/tests/test_gui.py (+76/-56) ubuntu_sso/gtk/tests/test_main.py (+4/-4) ubuntu_sso/keyring/__init__.py (+17/-9) ubuntu_sso/keyring/tests/test_common.py (+4/-5) ubuntu_sso/keyring/tests/test_linux.py (+1/-1) ubuntu_sso/logger.py (+20/-4) ubuntu_sso/main/__init__.py (+2/-2) ubuntu_sso/main/glib.py (+45/-0) ubuntu_sso/main/linux.py (+27/-22) ubuntu_sso/main/qt.py (+49/-0) ubuntu_sso/main/windows.py (+1/-1) ubuntu_sso/qt/gui.py (+2/-1) ubuntu_sso/qt/tests/login_u_p.py (+16/-5) ubuntu_sso/qt/tests/show_gui.py (+5/-6) ubuntu_sso/qt/tests/test_controllers.py (+4/-3) ubuntu_sso/qt/tests/test_enchanced_line_edit.py (+3/-2) ubuntu_sso/qt/tests/test_reset_password.py (+2/-1) ubuntu_sso/tests/__init__.py (+2/-2) ubuntu_sso/tests/bin/show_gui (+0/-58) ubuntu_sso/tests/bin/show_nm_state (+0/-41) ubuntu_sso/tests/test_account.py (+1/-1) ubuntu_sso/utils/tests/test_txsecrets.py (+3/-0) ubuntu_sso/utils/webclient/__init__.py (+2/-4) ubuntu_sso/utils/webclient/qtnetwork.py (+2/-0) ubuntu_sso/utils/webclient/tests/test_webclient.py (+1/-5) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntu-sso-client/gtk-gi | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+90134@code.qastaging.launchpad.net |
Commit message
- Added a dedicated logger for the gui module.
- Migrated the GTK UI to use GI bindings (LP: #801111).
- Enabled libsoup backend for webclient so the GTK UI will work.
- Enabled the running of all the tests using the single command ./run-tests.
- Added an initial version of GLib and Qt mainloop integration (needed to run all the tests).
Description of the change
You need to be running latest Ubuntu One nightlies in order this branch to work.
Also, if testing IRL, please note that the captcha image will not load because of bug #921822 (the rest of the remote calls works perfectly).
Another thing to note is that the change in the .glade file is caused by the upgrade of the syntax to latest Glade version (the changes were the result of opening the file in Glade @ precise, adding the activate-link signal handler to the 2 LinkButton we have, saving, and closing the file).
+1