From 837de4063dbe398735a5b1d35bde1821c177b555 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sat, 11 May 2019 09:39:02 -0600 Subject: [PATCH] OMEMO: Move files to fitting subdirectory --- plugins/omemo/CMakeLists.txt | 46 ++++++++++--------- .../{ => file_transfer}/file_provider.vala | 0 .../src/{ => file_transfer}/file_sender.vala | 0 plugins/omemo/src/{ => logic}/database.vala | 0 .../omemo/src/{ => logic}/encrypt_state.vala | 0 plugins/omemo/src/{ => logic}/manager.vala | 0 .../omemo/src/{ => logic}/pre_key_store.vala | 0 .../omemo/src/{ => logic}/session_store.vala | 0 .../src/{ => logic}/signed_pre_key_store.vala | 0 .../omemo/src/{ => logic}/trust_manager.vala | 0 plugins/omemo/src/{ => protocol}/bundle.vala | 0 .../src/{ => protocol}/message_flag.vala | 0 .../src/{ => protocol}/stream_module.vala | 0 .../src/{ => ui}/account_settings_entry.vala | 0 .../src/{ => ui}/account_settings_widget.vala | 0 .../src/{ => ui}/contact_details_dialog.vala | 0 .../{ => ui}/contact_details_provider.vala | 0 .../device_notification_populator.vala | 0 .../src/{ => ui}/encryption_list_entry.vala | 0 .../omemo/src/{ => ui}/manage_key_dialog.vala | 0 .../omemo/src/{ => ui}/own_notifications.vala | 0 plugins/omemo/src/{ => ui}/util.vala | 0 22 files changed, 25 insertions(+), 21 deletions(-) rename plugins/omemo/src/{ => file_transfer}/file_provider.vala (100%) rename plugins/omemo/src/{ => file_transfer}/file_sender.vala (100%) rename plugins/omemo/src/{ => logic}/database.vala (100%) rename plugins/omemo/src/{ => logic}/encrypt_state.vala (100%) rename plugins/omemo/src/{ => logic}/manager.vala (100%) rename plugins/omemo/src/{ => logic}/pre_key_store.vala (100%) rename plugins/omemo/src/{ => logic}/session_store.vala (100%) rename plugins/omemo/src/{ => logic}/signed_pre_key_store.vala (100%) rename plugins/omemo/src/{ => logic}/trust_manager.vala (100%) rename plugins/omemo/src/{ => protocol}/bundle.vala (100%) rename plugins/omemo/src/{ => protocol}/message_flag.vala (100%) rename plugins/omemo/src/{ => protocol}/stream_module.vala (100%) rename plugins/omemo/src/{ => ui}/account_settings_entry.vala (100%) rename plugins/omemo/src/{ => ui}/account_settings_widget.vala (100%) rename plugins/omemo/src/{ => ui}/contact_details_dialog.vala (100%) rename plugins/omemo/src/{ => ui}/contact_details_provider.vala (100%) rename plugins/omemo/src/{ => ui}/device_notification_populator.vala (100%) rename plugins/omemo/src/{ => ui}/encryption_list_entry.vala (100%) rename plugins/omemo/src/{ => ui}/manage_key_dialog.vala (100%) rename plugins/omemo/src/{ => ui}/own_notifications.vala (100%) rename plugins/omemo/src/{ => ui}/util.vala (100%) diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt index fe6bb079..0331851e 100644 --- a/plugins/omemo/CMakeLists.txt +++ b/plugins/omemo/CMakeLists.txt @@ -30,29 +30,33 @@ compile_gresources( vala_precompile(OMEMO_VALA_C SOURCES - src/account_settings_entry.vala - src/account_settings_widget.vala - src/bundle.vala - src/contact_details_provider.vala - src/contact_details_dialog.vala - src/database.vala - src/device_notification_populator.vala - src/own_notifications.vala - src/encrypt_state.vala - src/encryption_list_entry.vala - src/file_provider.vala - src/file_sender.vala - src/manage_key_dialog.vala - src/manager.vala - src/message_flag.vala src/plugin.vala - src/pre_key_store.vala src/register_plugin.vala - src/session_store.vala - src/signed_pre_key_store.vala - src/stream_module.vala - src/trust_manager.vala - src/util.vala + + src/file_transfer/file_provider.vala + src/file_transfer/file_sender.vala + + src/logic/database.vala + src/logic/encrypt_state.vala + src/logic/manager.vala + src/logic/pre_key_store.vala + src/logic/session_store.vala + src/logic/signed_pre_key_store.vala + src/logic/trust_manager.vala + + src/protocol/bundle.vala + src/protocol/message_flag.vala + src/protocol/stream_module.vala + + src/ui/account_settings_entry.vala + src/ui/account_settings_widget.vala + src/ui/contact_details_provider.vala + src/ui/contact_details_dialog.vala + src/ui/device_notification_populator.vala + src/ui/own_notifications.vala + src/ui/encryption_list_entry.vala + src/ui/manage_key_dialog.vala + src/ui/util.vala CUSTOM_VAPIS ${CMAKE_BINARY_DIR}/exports/signal-protocol.vapi ${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi diff --git a/plugins/omemo/src/file_provider.vala b/plugins/omemo/src/file_transfer/file_provider.vala similarity index 100% rename from plugins/omemo/src/file_provider.vala rename to plugins/omemo/src/file_transfer/file_provider.vala diff --git a/plugins/omemo/src/file_sender.vala b/plugins/omemo/src/file_transfer/file_sender.vala similarity index 100% rename from plugins/omemo/src/file_sender.vala rename to plugins/omemo/src/file_transfer/file_sender.vala diff --git a/plugins/omemo/src/database.vala b/plugins/omemo/src/logic/database.vala similarity index 100% rename from plugins/omemo/src/database.vala rename to plugins/omemo/src/logic/database.vala diff --git a/plugins/omemo/src/encrypt_state.vala b/plugins/omemo/src/logic/encrypt_state.vala similarity index 100% rename from plugins/omemo/src/encrypt_state.vala rename to plugins/omemo/src/logic/encrypt_state.vala diff --git a/plugins/omemo/src/manager.vala b/plugins/omemo/src/logic/manager.vala similarity index 100% rename from plugins/omemo/src/manager.vala rename to plugins/omemo/src/logic/manager.vala diff --git a/plugins/omemo/src/pre_key_store.vala b/plugins/omemo/src/logic/pre_key_store.vala similarity index 100% rename from plugins/omemo/src/pre_key_store.vala rename to plugins/omemo/src/logic/pre_key_store.vala diff --git a/plugins/omemo/src/session_store.vala b/plugins/omemo/src/logic/session_store.vala similarity index 100% rename from plugins/omemo/src/session_store.vala rename to plugins/omemo/src/logic/session_store.vala diff --git a/plugins/omemo/src/signed_pre_key_store.vala b/plugins/omemo/src/logic/signed_pre_key_store.vala similarity index 100% rename from plugins/omemo/src/signed_pre_key_store.vala rename to plugins/omemo/src/logic/signed_pre_key_store.vala diff --git a/plugins/omemo/src/trust_manager.vala b/plugins/omemo/src/logic/trust_manager.vala similarity index 100% rename from plugins/omemo/src/trust_manager.vala rename to plugins/omemo/src/logic/trust_manager.vala diff --git a/plugins/omemo/src/bundle.vala b/plugins/omemo/src/protocol/bundle.vala similarity index 100% rename from plugins/omemo/src/bundle.vala rename to plugins/omemo/src/protocol/bundle.vala diff --git a/plugins/omemo/src/message_flag.vala b/plugins/omemo/src/protocol/message_flag.vala similarity index 100% rename from plugins/omemo/src/message_flag.vala rename to plugins/omemo/src/protocol/message_flag.vala diff --git a/plugins/omemo/src/stream_module.vala b/plugins/omemo/src/protocol/stream_module.vala similarity index 100% rename from plugins/omemo/src/stream_module.vala rename to plugins/omemo/src/protocol/stream_module.vala diff --git a/plugins/omemo/src/account_settings_entry.vala b/plugins/omemo/src/ui/account_settings_entry.vala similarity index 100% rename from plugins/omemo/src/account_settings_entry.vala rename to plugins/omemo/src/ui/account_settings_entry.vala diff --git a/plugins/omemo/src/account_settings_widget.vala b/plugins/omemo/src/ui/account_settings_widget.vala similarity index 100% rename from plugins/omemo/src/account_settings_widget.vala rename to plugins/omemo/src/ui/account_settings_widget.vala diff --git a/plugins/omemo/src/contact_details_dialog.vala b/plugins/omemo/src/ui/contact_details_dialog.vala similarity index 100% rename from plugins/omemo/src/contact_details_dialog.vala rename to plugins/omemo/src/ui/contact_details_dialog.vala diff --git a/plugins/omemo/src/contact_details_provider.vala b/plugins/omemo/src/ui/contact_details_provider.vala similarity index 100% rename from plugins/omemo/src/contact_details_provider.vala rename to plugins/omemo/src/ui/contact_details_provider.vala diff --git a/plugins/omemo/src/device_notification_populator.vala b/plugins/omemo/src/ui/device_notification_populator.vala similarity index 100% rename from plugins/omemo/src/device_notification_populator.vala rename to plugins/omemo/src/ui/device_notification_populator.vala diff --git a/plugins/omemo/src/encryption_list_entry.vala b/plugins/omemo/src/ui/encryption_list_entry.vala similarity index 100% rename from plugins/omemo/src/encryption_list_entry.vala rename to plugins/omemo/src/ui/encryption_list_entry.vala diff --git a/plugins/omemo/src/manage_key_dialog.vala b/plugins/omemo/src/ui/manage_key_dialog.vala similarity index 100% rename from plugins/omemo/src/manage_key_dialog.vala rename to plugins/omemo/src/ui/manage_key_dialog.vala diff --git a/plugins/omemo/src/own_notifications.vala b/plugins/omemo/src/ui/own_notifications.vala similarity index 100% rename from plugins/omemo/src/own_notifications.vala rename to plugins/omemo/src/ui/own_notifications.vala diff --git a/plugins/omemo/src/util.vala b/plugins/omemo/src/ui/util.vala similarity index 100% rename from plugins/omemo/src/util.vala rename to plugins/omemo/src/ui/util.vala