Merge lp://qastaging/~elementary-dev-community/switchboard-plug-pantheon-shell/fix-1182413 into lp://qastaging/~elementary-apps/switchboard-plug-pantheon-shell/trunk
Proposed by
Cameron Norman
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 219 | ||||
| Proposed branch: | lp://qastaging/~elementary-dev-community/switchboard-plug-pantheon-shell/fix-1182413 | ||||
| Merge into: | lp://qastaging/~elementary-apps/switchboard-plug-pantheon-shell/trunk | ||||
| Diff against target: |
124 lines (+38/-18) 1 file modified
src/Wallpaper.vala (+38/-18) |
||||
| To merge this branch: | bzr merge lp://qastaging/~elementary-dev-community/switchboard-plug-pantheon-shell/fix-1182413 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Apps team | Pending | ||
|
Review via email:
|
|||
Description of the change
Based on Richard Stromer's branch, just rebased on current trunk.
One notable change is that it gets rid of the WALLPAPER_DIR variable completely. The directory to load is just given to the load_wallpapers function directly.
Otherwise, it is the same as Stromer's work.
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
