diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/data/add_conversation/list_row.ui | 1 | ||||
| -rw-r--r-- | main/src/ui/conversation_view_controller.vala | 2 |
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(); } }); |