aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/entities/Conversation.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-02 16:00:03 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-02 16:00:03 +0200
commit97b52abaf9dc43f643c3925c2c836d752b993dd8 (patch)
treea0a39ade4eb0b3ef317e4268a5ee695097798eb4 /src/eu/siacs/conversations/entities/Conversation.java
parent0ae852a6331a06b169152084719c0692db05ac5d (diff)
fixed #410 by removing that config option
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/entities/Conversation.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 4c55d5ee..8dc9b3ca 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -141,9 +141,8 @@ public class Conversation extends AbstractEntity {
this.messages = msgs;
}
- public String getName(boolean useSubject) {
- if ((getMode() == MODE_MULTI) && (getMucOptions().getSubject() != null)
- && useSubject) {
+ public String getName() {
+ if (getMode() == MODE_MULTI && getMucOptions().getSubject() != null) {
return getMucOptions().getSubject();
} else if (getMode() == MODE_MULTI && bookmark != null
&& bookmark.getName() != null) {