Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/printer-state into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Andrew Hayzen |
| Approved revision: | 214 |
| Merged at revision: | 215 |
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-settings-components/printer-state |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
79 lines (+20/-9) 4 files modified
plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+10/-1) plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+1/-1) tests/unittests/Printers/mockbackend.h (+4/-6) tests/unittests/Printers/tst_printer.cpp (+5/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/printer-state |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hayzen (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* adds read of printer state
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM :-)