From 21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 26 May 2016 22:53:55 +0200
Subject: add 'create conference' dialog

---
 src/main/java/eu/siacs/conversations/entities/Bookmark.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index fd6a5dab9..c5c4ff5dd 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -50,9 +50,8 @@ public class Bookmark extends Element implements ListItem {
 
 	@Override
 	public String getDisplayName() {
-		if (this.mJoinedConversation != null
-				&& (this.mJoinedConversation.getMucOptions().getSubject() != null)) {
-			return this.mJoinedConversation.getMucOptions().getSubject();
+		if (this.mJoinedConversation != null) {
+			return this.mJoinedConversation.getName();
 		} else if (getBookmarkName() != null) {
 			return getBookmarkName();
 		} else {
-- 
cgit v1.2.3