summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--TelepathyQt4Yell/Models/contact-model-item.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 26bf4de..474664c 100644
--- a/NEWS
+++ b/NEWS
@@ -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: