1 files changed, 9 insertions, 11 deletions

diff --git a/src/model/ThreadListModel.cpp b/src/model/ThreadListModel.cpp
index aec692d..7c6ca0c 100644
--- a/src/model/ThreadListModel.cpp
+++ b/src/model/ThreadListModel.cpp
@@ -36,16 +36,14 @@ ThreadListModel::data (const QModelIndex &index, int role) const
 
   switch (role)
   {
-#if FIXME
-  case NAME:
-    return msg->name ();
+  case METHOD:
+    return msg->method ();
+  case TEXT:
+    return msg->text ();
+  case TITLE:
+    return msg->title ();
   case PUBKEY:
-    return msg->pubKeyString ();
-  case TYPE:
-    return msg->type ();
-  case DESC:
-    return msg->desc ();
-#endif
+    return msg->place ()->pubKeyString ();
   default:
     return QVariant();
   }
@@ -57,9 +55,9 @@ ThreadListModel::roleNames () const
 {
   QHash<int, QByteArray> roles;
 
-  roles[TITLE] = "title";
+  roles[METHOD] = "method";
   roles[TEXT] = "text";
-  roles[TYPE] = "type";
+  roles[TITLE] = "title";
   roles[PUBKEY] = "pubKey";
 
   return roles;