diff options
| author | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-06-04 15:34:08 -0500 |
|---|---|---|
| committer | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-06-04 15:34:08 -0500 |
| commit | 922bc1c1fd57c841fc7293673f776ab49638914e (patch) | |
| tree | 8c240589aa6f31d1c29523cd6c54ca0f5991f4b2 | |
| parent | d74173e80adb1d57838c75c1a41ab1faff5d1994 (diff) | |
| parent | 170359981f25700395f6c19e9effac551bc82fb6 (diff) | |
Merge remote branch 'asoliver/encoding'
Reviewed by: Mateu Batle Sastre <mateu.batle@collabora.co.uk>
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TelepathyQt4Yell/Models/contact-model-item.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -8,6 +8,8 @@ Enhancements: Fixes: * Make the account model item use the status of the Connection object instead of the account one + * Change the alias and statusMessage roles of the contact model item to return UTF-8 instead of QString + have it display correctly in QML with extended characters telepathy-qt4-yell 0.1.5 (2011-05-26) ====================================== diff --git a/TelepathyQt4Yell/Models/contact-model-item.cpp b/TelepathyQt4Yell/Models/contact-model-item.cpp index 564d831..f8cb96f 100644 --- a/TelepathyQt4Yell/Models/contact-model-item.cpp +++ b/TelepathyQt4Yell/Models/contact-model-item.cpp @@ -105,13 +105,13 @@ QVariant ContactModelItem::data(int role) const return mPriv->mContact->id(); case Qt::DisplayRole: case AccountsModel::AliasRole: - return mPriv->mContact->alias(); + return mPriv->mContact->alias().toUtf8(); case AccountsModel::PresenceStatusRole: return mPriv->mContact->presence().status(); case AccountsModel::PresenceTypeRole: return mPriv->mContact->presence().type(); case AccountsModel::PresenceMessageRole: - return mPriv->mContact->presence().statusMessage(); + return mPriv->mContact->presence().statusMessage().toUtf8(); case AccountsModel::SubscriptionStateRole: return mPriv->mContact->subscriptionState(); case AccountsModel::PublishStateRole: |