Review Request 117601: Improve wallpapers deduplication code a bit

[Martin Klapetek]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/117601/
-----------------------------------------------------------

(Updated April 16, 2014, 9:21 p.m.)


Review request for Plasma.


Changes
-------

Move the "continue;" a bit down so it catches also if the symlink exists in the passed paths; also check only if we modified the original path (otherwise the duplicated path would never get through)


Repository: plasma-workspace


Description
-------

On my system, I have a symlink /usr/share/wallpapers/kde-default.png -> /usr/share/wallpapers/Elarun/contents/images/someresolution.png. This symlink gets processed as an additional image even though it actually points to an image which is already in the set.

So I changed it to always work with the target rather than symlink and then it also checks for the target possibly being in a package, if it is, then it processes the whole package rather than only one file from it.

This fixes one wallpaper (same path) to be shown twice in the wallpaper select dialog.


Diffs (updated)
-----

  wallpapers/image/backgroundlistmodel.cpp 9a051fe 

Diff: https://git.reviewboard.kde.org/r/117601/diff/


Testing
-------


Thanks,

Martin Klapetek

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20140416/4a771667/attachment-0001.html>