aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2022-10-09 11:39:17 +0200
committerfiaxh <git@lightrise.org>2022-10-09 11:48:58 +0200
commit7d8b08deca0aa4eb24def6b9af4ec180c0bc9a27 (patch)
treef3f0bb4c3b3f7c03519d9ba75f0346ed1e85c4b2
parent03878eee495cac8dcc8baf0ff4f84e4c9e76114e (diff)
downloaddino-7d8b08deca0aa4eb24def6b9af4ec180c0bc9a27.tar.gz
dino-7d8b08deca0aa4eb24def6b9af4ec180c0bc9a27.zip
Small fixes
-rw-r--r--main/data/add_conversation/list_row.ui1
-rw-r--r--main/src/ui/conversation_view_controller.vala2
2 files changed, 2 insertions, 1 deletions
diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui
index 06b6dc7f..c0d7e517 100644
--- a/main/data/add_conversation/list_row.ui
+++ b/main/data/add_conversation/list_row.ui
@@ -17,6 +17,7 @@
</child>
<child>
<object class="GtkGrid">
+ <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="name_label">
diff --git a/main/src/ui/conversation_view_controller.vala b/main/src/ui/conversation_view_controller.vala
index 50c0dcdb..5844ef0a 100644
--- a/main/src/ui/conversation_view_controller.vala
+++ b/main/src/ui/conversation_view_controller.vala
@@ -82,7 +82,7 @@ public class ConversationViewController : Object {
}
});
stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect((account, jid, roster_item) => {
- if (conversation.account.equals(account) && conversation.counterpart.equals(jid)) {
+ if (conversation != null && conversation.account.equals(account) && conversation.counterpart.equals(jid)) {
update_conversation_display_name();
}
});