diff -r 2dc6caa42ec3 -r 9ba4404ef423 emailservices/nmutilities/src/emailmailboxinfo_p.cpp --- a/emailservices/nmutilities/src/emailmailboxinfo_p.cpp Fri May 14 15:41:10 2010 +0300 +++ b/emailservices/nmutilities/src/emailmailboxinfo_p.cpp Thu May 27 12:43:55 2010 +0300 @@ -44,21 +44,14 @@ private constructor */ EmailMailboxInfoPrivate::EmailMailboxInfoPrivate() : - QObject(NULL), - mIsResourceLoaded(false) + QObject(NULL) { XQSettingsManager manager; XQCentralRepositorySettingsKey rccKey(EMAIL_CENREP, RCC_PATH); XQCentralRepositorySettingsKey wlbKey(EMAIL_CENREP, WLB_BRAND_NAME); - mWlbDomainName = manager.readItemValue(wlbKey, XQSettingsManager::TypeString).value (); - - QString pathToRcc = - manager.readItemValue(rccKey, XQSettingsManager::TypeString).value (); - if (!mIsResourceLoaded) { - mIsResourceLoaded = QResource::registerResource(pathToRcc); - } + mWlbDomainName = manager.readItemValue(wlbKey, XQSettingsManager::TypeString).value (); } /*! private destructor @@ -131,6 +124,10 @@ QString domainName = ""; if (identifier.canConvert ()) { domainName = identifier.value (); + int delimIndex = domainName.lastIndexOf('@'); + if(delimIndex >= 0) { + domainName = domainName.mid(delimIndex + 1); + } } if (domainName.length() > 0){ @@ -198,13 +195,13 @@ if (regExp.exactMatch(brandingId)) { //match found = true; - icon = ":/" + cenRepRecord.at(3); + icon = "z:/resource/apps/" + cenRepRecord.at(3) + ".svg"; name = cenRepRecord.at(2); break; } } } - if (!found || !mIsResourceLoaded) { + if (!found ) { //get default icon and name icon = "qtg_large_email"; QStringList domain = brandingId.split(".");