From a9ae79878e5289d198af47fc4e9e2149450b2502 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 3 Mar 2017 19:22:45 +0100 Subject: Use Window instead of ApplicationWindow for main view --- client/src/ui/conversation_list_titlebar.vala | 8 ++++---- client/src/ui/unified_window.vala | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'client/src/ui') diff --git a/client/src/ui/conversation_list_titlebar.vala b/client/src/ui/conversation_list_titlebar.vala index 4835ec66..4e465532 100644 --- a/client/src/ui/conversation_list_titlebar.vala +++ b/client/src/ui/conversation_list_titlebar.vala @@ -15,12 +15,12 @@ public class Dino.Ui.ConversationListTitlebar : Gtk.HeaderBar { private StreamInteractor stream_interactor; - public ConversationListTitlebar(ApplicationWindow application, StreamInteractor stream_interactor) { + public ConversationListTitlebar(Window application, StreamInteractor stream_interactor) { this.stream_interactor = stream_interactor; create_add_menu(application); } - private void create_add_menu(ApplicationWindow application) { + private void create_add_menu(Window window) { SimpleAction contacts_action = new SimpleAction("add_chat", null); contacts_action.activate.connect(() => { AddConversation.Chat.Dialog add_chat_dialog = new AddConversation.Chat.Dialog(stream_interactor); @@ -28,7 +28,7 @@ public class Dino.Ui.ConversationListTitlebar : Gtk.HeaderBar { add_chat_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation)); add_chat_dialog.show(); }); - application.add_action(contacts_action); + window.get_application().add_action(contacts_action); SimpleAction conference_action = new SimpleAction("add_conference", null); conference_action.activate.connect(() => { @@ -37,7 +37,7 @@ public class Dino.Ui.ConversationListTitlebar : Gtk.HeaderBar { add_conference_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation)); add_conference_dialog.show(); }); - application.add_action(conference_action); + window.get_application().add_action(conference_action); Builder builder = new Builder.from_resource("/org/dino-im/menu_add.ui"); MenuModel menu = builder.get_object("menu_add") as MenuModel; diff --git a/client/src/ui/unified_window.vala b/client/src/ui/unified_window.vala index 9d5f1dfd..8a9500e9 100644 --- a/client/src/ui/unified_window.vala +++ b/client/src/ui/unified_window.vala @@ -2,7 +2,7 @@ using Gtk; using Dino.Entities; -public class Dino.Ui.UnifiedWindow : ApplicationWindow { +public class Dino.Ui.UnifiedWindow : Window { public ChatInput chat_input; public ConversationListTitlebar conversation_list_titlebar; public ConversationSelector.View filterable_conversation_list; -- cgit v1.2.3-70-g09d2