lp:~nataliabidart/ubuntu-sso-client/gtk-gi

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-sso-client at revision 843

dobey (community): Approve on 2012-02-01

Roberto Alsina (community): Approve on 2012-01-27

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #801111: should use GTK3	High	Fix Released
Bug #925617: Tests are not cleaning up some widgets	Medium	Fix Released

Link a bug report

Related blueprints

862. By Natalia Bidart on 2012-02-02

Merged trunk in.

861. By Natalia Bidart on 2012-02-02

Attaching new bug number.

860. By Natalia Bidart on 2012-02-02

- Add cleanups calls to every created UI.

859. By Natalia Bidart on 2012-02-02

- Adding proper cleanup for GTK windows created during tests.

858. By Natalia Bidart on 2012-02-01

Merged trunk in.

857. By Natalia Bidart on 2012-01-27

Merged trunk in.

856. By Natalia Bidart on 2012-01-26

Merged trunk in.

855. By Natalia Bidart on 2012-01-26

Fixed tests in windows, fixed more lint issues.

854. By Natalia Bidart on 2012-01-26

Pep8 fix.

853. By Natalia Bidart on 2012-01-26

Fixed windows lint issues.