Merge lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Proposed by
Richard Stromer
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 219 | ||||
Proposed branch: | lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 | ||||
Merge into: | lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk | ||||
Diff against target: |
90 lines (+37/-3) 1 file modified
src/Wallpaper.vala (+37/-3) |
||||
To merge this branch: | bzr merge lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danielle Foré | Needs Fixing | ||
David Gomes (community) | Needs Fixing | ||
Review via email: mp+182417@code.launchpad.net |
Description of the change
Search recursively for images in all sub-folders (does not cover loops)
To post a comment you must log in.
Diff line 41 should be: switchboard_ controller. progress_ bar_set_ text (_("Importing wallpapers from %s.").printf (basefolder));
plug.
Diff lines 58-60 should be:
if (info.get_file_type () == FileType.DIRECTORY) {
load_wallpaper s (basefolder + "/" + info.get_name ()); is_valid_ file_type (info)) {
} else if (!IOHelper.