Use the display name of a collection if available, and use the photo from a contact if available.
Use the display name of a collection if available, and use the photo from a contact if available.

svn path=/trunk/KDE/kdepim/akonadi/akonadi_next/; revision=997165

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi