aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-21 20:00:25 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-21 20:00:25 +0100
commit97344c079ad1951c538402243933f3ebe1349473 (patch)
tree9132a1be7137fce6b6b2045a4559b2d486540595 /src/main/java
parent424de3ea3a0100ae722ca2b2498c171078320cdb (diff)
parentfebbefefa5c1008398d35fcbe6d6e235da37c24e (diff)
Merge pull request #707 from betheg/joinmuc
MUC: set from when join muc.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 9abff281..6958a062 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1273,6 +1273,7 @@ public class XmppConnectionService extends Service {
String nick = conversation.getMucOptions().getProposedNick();
Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
PresencePacket packet = new PresencePacket();
+ packet.setFrom(conversation.getAccount().getJid());
packet.setTo(joinJid);
Element x = new Element("x");
x.setAttribute("xmlns", "http://jabber.org/protocol/muc");