Merge lp://staging/~dobey/software-center/update-13-10 into lp://staging/software-center/stable-13-10
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 3313 |
Merged at revision: | 3312 |
Proposed branch: | lp://staging/~dobey/software-center/update-13-10 |
Merge into: | lp://staging/software-center/stable-13-10 |
Diff against target: |
4850 lines (+615/-3764) 25 files modified
bin/software-center-sso-gtk (+0/-36) setup.py (+0/-4) softwarecenter/backend/installbackend_impl/aptd.py (+5/-0) softwarecenter/backend/login_impl/login_sso.py (+2/-3) softwarecenter/backend/unitylauncher.py (+51/-24) softwarecenter/backend/zeitgeist_logger.py (+97/-0) softwarecenter/db/categories.py (+3/-1) softwarecenter/db/database.py (+1/-1) softwarecenter/distro/__init__.py (+6/-0) softwarecenter/distro/fedora.py (+3/-0) softwarecenter/distro/ubuntu.py (+3/-0) softwarecenter/sso/__init__.py (+0/-18) softwarecenter/sso/gui.py (+0/-1168) softwarecenter/sso/tests/__init__.py (+0/-27) softwarecenter/sso/tests/test_gui.py (+0/-2300) softwarecenter/ui/gtk3/panes/availablepane.py (+103/-79) softwarecenter/ui/gtk3/widgets/stars.py (+1/-1) softwarecenter/utils.py (+20/-8) tests/gtk3/test_navhistory.py (+1/-1) tests/gtk3/test_unity_launcher_integration_gui.py (+30/-91) tests/gtk3/test_zeitgeist_logger_gui.py (+95/-0) tests/gtk3/windows.py (+8/-2) tests/test_unity_launcher.py (+48/-0) tests/test_utils.py (+52/-0) tests/test_zeitgeist_logger.py (+86/-0) |
To merge this branch: | bzr merge lp://staging/~dobey/software-center/update-13-10 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alejandro J. Cura (community) | Approve | ||
Roberto Alsina | Approve | ||
Review via email:
|
Commit message
[Rodney Dawes]
Fix some RuntimeWarnings about old-style classes.
Remove the old gtk+ based SSO UI, and rely on the system library and UI.
Use the "Ubuntu One" token for authenticating to the server now.
[Marco Trevisan]
Log zeitgeist events on application install/removal.
[Michael Vogt]
Improve Unity launcher integration.
[Sv. Lockal]
Fix UnicodeDecodeError for localized category names.
To post a comment you must log in.
+1