diff options
| -rw-r--r-- | libdino/src/service/conversation_manager.vala | 8 | ||||
| -rw-r--r-- | main/src/ui/conversation_summary/conversation_item_skeleton.vala | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libdino/src/service/conversation_manager.vala b/libdino/src/service/conversation_manager.vala index b1e8d8a8..039bad53 100644 --- a/libdino/src/service/conversation_manager.vala +++ b/libdino/src/service/conversation_manager.vala @@ -35,9 +35,11 @@ public class ConversationManager : StreamInteractionModule, Object { Jid store_jid = type == Conversation.Type.GROUPCHAT ? jid.bare_jid : jid; // Do we already have a conversation for this jid? - foreach (var conversation in conversations[account][store_jid]) { - if (conversation.type_ == type) { - return conversation; + if (conversations[account].has_key(store_jid)) { + foreach (var conversation in conversations[account][store_jid]) { + if (conversation.type_ == type) { + return conversation; + } } } diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_summary/conversation_item_skeleton.vala index 808bcf7a..ad12dd85 100644 --- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_summary/conversation_item_skeleton.vala @@ -46,8 +46,8 @@ public class ConversationItemSkeleton : EventBox { default_header.add_item(item); } Widget? widget = item.get_widget(Plugins.WidgetType.GTK) as Widget; - widget.valign = Align.END; if (widget != null) { + widget.valign = Align.END; header_content_box.add(widget); } |