Merge pull request #58 from elvisangelaccio/master

You've got the point. Merged this.

1 files changed, 0 insertions, 6 deletions

diff --git a/room.cpp b/room.cpp
index 55531824..5aea6ff0 100644
--- a/room.cpp
+++ b/room.cpp
@@ -792,12 +792,6 @@ QString Room::Private::calculateDisplayname() const
 
     // 1. Name (from m.room.name)
     if (!name.isEmpty()) {
-        // The below two lines extend the spec. They take care of the case
-        // when there are two rooms with the same name.
-        // The format is unwittingly borrowed from the email address format.
-        if (!canonicalAlias.isEmpty())
-            return name % " <" % canonicalAlias % ">";
-
         return name;
     }