From 8944029128e3d0f9e32b61e00e880d92fceabb31 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 5 Sep 2017 23:53:18 +0200 Subject: Move encryption menu into ChatInput, PGP support for MUCs --- main/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/CMakeLists.txt') diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 44cf3c6a..cd504810 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -47,7 +47,7 @@ set(RESOURCE_LIST settings_dialog.ui unified_window_placeholder.ui - pre_theme.css + theme.css ) compile_gresources( @@ -85,6 +85,7 @@ SOURCES src/ui/add_conversation/select_jid_fragment.vala src/ui/avatar_generator.vala src/ui/chat_input/edit_history.vala + src/ui/chat_input/encryption_button.vala src/ui/chat_input/occupants_tab_completer.vala src/ui/chat_input/smiley_converter.vala src/ui/chat_input/view.vala @@ -107,7 +108,6 @@ SOURCES src/ui/conversation_summary/message_populator.vala src/ui/conversation_summary/message_textview.vala src/ui/conversation_summary/slashme_message_display.vala - src/ui/conversation_titlebar/encryption_entry.vala src/ui/conversation_titlebar/menu_entry.vala src/ui/conversation_titlebar/occupants_entry.vala src/ui/conversation_titlebar/view.vala -- cgit v1.2.3-54-g00ecf