use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set

1 files changed, 9 insertions, 0 deletions

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index fbd87f3f..8e2c1784 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -144,6 +144,8 @@ public class Conversation extends AbstractEntity {
 		if ((getMode() == MODE_MULTI) && (getMucOptions().getSubject() != null)
 				&& useSubject) {
 			return getMucOptions().getSubject();
+		} else if (getMode() == MODE_MULTI && bookmark!=null && bookmark.getName() != null) {
+			return bookmark.getName();
 		} else {
 			return this.getContact().getDisplayName();
 		}
@@ -380,5 +382,12 @@ public class Conversation extends AbstractEntity {
 
 	public void setBookmark(Bookmark bookmark) {
 		this.bookmark = bookmark;
+		this.bookmark.setConversation(this);
+	}
+	
+	public void deregisterWithBookmark() {
+		if (this.bookmark != null) {
+			this.bookmark.setConversation(null);
+		}
 	}
 }