Review Request 129276: Make sure we're looking both for json and desktop metadata

[Aleix Pol Gonzalez]

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

Review request for Plasma.


Repository: plasma-workspace


Description
-------

We shouldn't assume metadata is in metadata.desktop


Diffs
-----

  shell/containmentconfigview.cpp 4c9d146 
  shell/scripting/scriptengine_v1.cpp 23cb839 
  wallpapers/image/backgroundlistmodel.cpp b30d86d 
  wallpapers/image/image.cpp 0a65b7d 

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


Testing
-------

Tests pass, all plasma desktop loads properly, even if I remove `.config/plasma-org.kde.plasma.desktop-appletsrc`


Thanks,

Aleix Pol Gonzalez

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