diff options
| author | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-06-21 18:07:38 -0500 |
|---|---|---|
| committer | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-06-21 18:07:38 -0500 |
| commit | 57e8266144bbf45aebd713facd97980c8f6e4638 (patch) | |
| tree | ff571fea105a5984fed0439c8786a4aca58a5d77 | |
| parent | a1ee79ac31047251a7b37fdfb1dfe225f11651ff (diff) | |
| parent | 0c682ec740471e265329ad654de8c26229f99717 (diff) | |
Merge remote branch 'asoliver/encoding'
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | TelepathyQt4Yell/Models/contact-model-item.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -7,6 +7,7 @@ Fixes: * Report the connection status reason using the Connection object if possible * On connection invalidated, emit the connection status changed signal to make sure the account model item is updated * Add constructor to Tpy::ContactCapabilities so it can be really used + * Revert returning UTF-8 for the contact alias and status messages strings telepathy-qt4-yell 0.1.6 (2011-06-06) ====================================== diff --git a/TelepathyQt4Yell/Models/contact-model-item.cpp b/TelepathyQt4Yell/Models/contact-model-item.cpp index f8cb96f..564d831 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().toUtf8(); + return mPriv->mContact->alias(); case AccountsModel::PresenceStatusRole: return mPriv->mContact->presence().status(); case AccountsModel::PresenceTypeRole: return mPriv->mContact->presence().type(); case AccountsModel::PresenceMessageRole: - return mPriv->mContact->presence().statusMessage().toUtf8(); + return mPriv->mContact->presence().statusMessage(); case AccountsModel::SubscriptionStateRole: return mPriv->mContact->subscriptionState(); case AccountsModel::PublishStateRole: |