Merge lp://staging/~mvo/software-center/path-cleansweep into lp://staging/software-center
Proposed by
Michael Vogt
| Status: | Merged |
|---|---|
| Merged at revision: | 3191 |
| Proposed branch: | lp://staging/~mvo/software-center/path-cleansweep |
| Merge into: | lp://staging/software-center |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://staging/~mvo/software-center/path-cleansweep |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gary Lasker (community) | Approve | ||
| Michael Vogt (community) | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
As discussed on irc on friday this branch eliminates the passing
around of datadir/desktopdir or xapian dir. The softwarecenter.
module is used for this information now.
To post a comment you must log in.
Revision history for this message
| Gary Lasker (gary-lasker) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Michael, at this point trunk has diverged somewhat dramatically. Would you mind fixing the conflicts, and then I will finish reviewing this? I don't mind doing it if you prefer, just let me know. Thanks!
Text conflict in softwarecenter/
Text conflict in softwarecenter/
Text conflict in tests/gtk3/
Text conflict in tests/gtk3/