diff options
| author | Marvin W <git@larma.de> | 2017-03-20 19:27:39 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2017-03-23 16:48:26 +0100 |
| commit | ef0483765a0fd567f25b1f0af6df04e8973e5624 (patch) | |
| tree | 9288c239217496774710542b922cdd264e0838cc /main/src/ui | |
| parent | aca6842c490c52b6460b7d9ebd7cc77eec4b97ef (diff) | |
| download | dino-ef0483765a0fd567f25b1f0af6df04e8973e5624.tar.gz dino-ef0483765a0fd567f25b1f0af6df04e8973e5624.zip | |
Small bug fixes and compatibility with Vala 0.36
Diffstat (limited to 'main/src/ui')
| -rw-r--r-- | main/src/ui/add_conversation/conference/dialog.vala | 8 | ||||
| -rw-r--r-- | main/src/ui/conversation_summary/conversation_item.vala | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/src/ui/add_conversation/conference/dialog.vala b/main/src/ui/add_conversation/conference/dialog.vala index d766a5a8..c035c11d 100644 --- a/main/src/ui/add_conversation/conference/dialog.vala +++ b/main/src/ui/add_conversation/conference/dialog.vala @@ -41,7 +41,7 @@ public class Dialog : Gtk.Dialog { if (cancel_image.get_parent() != null) cancel_button.remove(cancel_image); cancel_button.add(cancel_label); cancel_button.clicked.disconnect(show_jid_add_view); - cancel_button.clicked.connect(close); + cancel_button.clicked.connect(on_cancel); ok_button.label = "Next"; ok_button.sensitive = select_fragment.done; ok_button.clicked.disconnect(on_ok_button_clicked); @@ -55,7 +55,7 @@ public class Dialog : Gtk.Dialog { private void show_conference_details_view() { if (cancel_label.get_parent() != null) cancel_button.remove(cancel_label); cancel_button.add(cancel_image); - cancel_button.clicked.disconnect(close); + cancel_button.clicked.disconnect(on_cancel); cancel_button.clicked.connect(show_jid_add_view); ok_button.label = "Join"; ok_button.sensitive = details_fragment.done; @@ -143,8 +143,8 @@ public class Dialog : Gtk.Dialog { close(); } - private void close() { - base.close(); + private void on_cancel() { + close(); } private void animate_window_resize() { diff --git a/main/src/ui/conversation_summary/conversation_item.vala b/main/src/ui/conversation_summary/conversation_item.vala index fa91f78e..a99025ab 100644 --- a/main/src/ui/conversation_summary/conversation_item.vala +++ b/main/src/ui/conversation_summary/conversation_item.vala @@ -25,7 +25,7 @@ public interface ConversationItem : Gtk.Widget { case MessageKind.ME_COMMAND: return new SlashMeItem(stream_interactor, conversation, message); } - return null; + assert_not_reached(); } } |