lp://staging/~mvo/software-center/path-cleansweep

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/software-center at revision 3191

Gary Lasker (community): Approve on 2012-09-20

Michael Vogt (community): Needs Resubmitting on 2012-09-18

Diff: 978 lines (+95/-149)

27 files modified

software-center (+2/-2)
softwarecenter/db/categories.py (+2/-3)
softwarecenter/paths.py (+7/-4)
softwarecenter/ui/gtk3/app.py (+13/-17)
softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py (+1/-1)
softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py (+8/-6)
softwarecenter/ui/gtk3/models/appstore2.py (+1/-3)
softwarecenter/ui/gtk3/panes/availablepane.py (+8/-18)
softwarecenter/ui/gtk3/panes/globalpane.py (+2/-2)
softwarecenter/ui/gtk3/panes/historypane.py (+1/-2)
softwarecenter/ui/gtk3/panes/installedpane.py (+4/-5)
softwarecenter/ui/gtk3/panes/softwarepane.py (+2/-4)
softwarecenter/ui/gtk3/panes/viewswitcher.py (+1/-1)
softwarecenter/ui/gtk3/session/appmanager.py (+2/-4)
softwarecenter/ui/gtk3/utils.py (+5/-2)
softwarecenter/ui/gtk3/views/appdetailsview.py (+2/-2)
softwarecenter/ui/gtk3/views/catview.py (+3/-8)
softwarecenter/ui/gtk3/views/lobbyview.py (+4/-5)
softwarecenter/ui/qml/categoriesmodel.py (+1/-3)
softwarecenter/utils.py (+1/-0)
tests/gtk3/test_app.py (+1/-4)
tests/gtk3/test_catview.py (+3/-7)
tests/gtk3/test_debfile_view.py (+1/-4)
tests/gtk3/test_memleak.py (+1/-4)
tests/gtk3/test_purchase.py (+1/-5)
tests/gtk3/windows.py (+16/-30)
tests/utils.py (+2/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3113. By Michael Vogt on 2012-09-18

merged trunk and resolved conflicts

3112. By Michael Vogt on 2012-09-17

tests/gtk3/test_memleak.py: update to new path system

3111. By Michael Vogt on 2012-09-17

merged trunk

3110. By Michael Vogt on 2012-09-14

tests/gtk3/windows.py: fix crash

3109. By Michael Vogt on 2012-09-14

add default arg for parse_applications_menu()

3108. By Michael Vogt on 2012-09-14

go over it all and kill off passing datadir and desktopdir around, its really part of softwarecenter.paths.{datadir,desktopdir}

3107. By Michael Vogt on 2012-09-14

pyflake cleanup/test updates

3106. By Michael Vogt on 2012-09-14

get rid of datadir, desktopdir for SoftwareCenterAppGtk3

3105. By Michael Vogt on 2012-08-17

softwarecenter/db/categories.py: the DB must be part of the cachekey in the CategoriesParser as it the parser yields different results depending on the DB

3104. By Michael Vogt on 2012-08-17

make CategoriesParser a member of CategoriesViewGtk instead of a subclass, move parsing out of build(), remove dead comments