From 75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 4 Apr 2017 15:47:00 +0200 Subject: MessageStorage/Processor, correctly resolve conversations (fixup 22adbd3) --- libdino/src/entity/conversation.vala | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libdino/src/entity') diff --git a/libdino/src/entity/conversation.vala b/libdino/src/entity/conversation.vala index 5a41c7fb..7e8b1424 100644 --- a/libdino/src/entity/conversation.vala +++ b/libdino/src/entity/conversation.vala @@ -90,6 +90,11 @@ public class Conversation : Object { private void on_update(Object o, ParamSpec sp) { var update = db.conversation.update().with(db.conversation.jid_id, "=", db.get_jid_id(counterpart)) .with(db.conversation.account_id, "=", account.id); + if (counterpart.resourcepart != null) { + update.with(db.conversation.resource, "=", counterpart.resourcepart); + } else { + update.with_null(db.conversation.resource); + } switch (sp.name) { case "type-": update.set(db.conversation.type_, type_); break; -- cgit v1.2.3-70-g09d2