[libcontacts] Name grouper fixes.

Allow grouper to override default set of groups. Ensure
returned group is in the valid list of groups.

src/seasidecache.cpp

@@ -575,13 +575,9 @@ void SeasideCache::setNameGrouper(SeasideNameGrouper *grouper)
         new SeasideCache;
     instancePtr->m_nameGrouper.reset(grouper);
 
-    allContactNameGroups = getAllContactNameGroups();
-    QStringList groups = instancePtr->m_nameGrouper->allNameGroups();
-    for (int i = groups.count() - 1; i > -1; --i) {
-        const QString &group = groups.at(i);
-        if (!allContactNameGroups.contains(group))
-            allContactNameGroups.prepend(group);
-    }
+    allContactNameGroups = instancePtr->m_nameGrouper->allNameGroups();
+    if (!allContactNameGroups.contains(QLatin1String("#")))
+        allContactNameGroups << QLatin1String("#");
 }
 
 QString SeasideCache::nameGroup(const CacheItem *cacheItem)
@@ -599,7 +595,7 @@ QString SeasideCache::determineNameGroup(const CacheItem *cacheItem)
 
     if (!instancePtr->m_nameGrouper.isNull()) {
         QString group = instancePtr->m_nameGrouper->nameGroupForContact(cacheItem->contact, instancePtr->m_groupProperty);
-        if (!group.isNull()) {
+        if (!group.isNull() && allContactNameGroups.contains(group)) {
             return group;
         }
     }