incomming jingle packets are routed to their connection. added presence chooser in gui

2 files changed, 14 insertions, 0 deletions

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index f8c6a2a6..6eb688ae 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -45,6 +45,8 @@ public class Conversation extends AbstractEntity {
 	private int status;
 	private long created;
 	private int mode;
+	
+	private String nextPresence;
 
 	private transient List<Message> messages = null;
 	private transient Account account = null;
@@ -308,4 +310,12 @@ public class Conversation extends AbstractEntity {
 	public void setContactJid(String jid) {
 		this.contactJid = jid;
 	}
+	
+	public void setNextPresence(String presence) {
+		this.nextPresence = presence;
+	}
+	
+	public String getNextPresence() {
+		return this.nextPresence;
+	}
 }
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index a81ff0d3..841edfff 100644
--- a/src/eu/siacs/conversations/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -166,4 +166,8 @@ public class Message extends AbstractEntity {
 	public int getType() {
 		return this.type;
 	}
+
+	public void setPresence(String presence) {
+		this.counterpart = this.counterpart.split("/")[0] + "/" + presence;
+	}
 }