diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index 1d0a23af7..bd74ebb48 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/sandbox.h" #include "core/local_url_handlers.h" #include "core/launcher.h" -#include "core/core_ui_integration.h" +#include "core/ui_integration.h" #include "chat_helpers/emoji_keywords.h" #include "storage/localstorage.h" #include "platform/platform_specific.h" diff --git a/Telegram/SourceFiles/core/core_ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp similarity index 99% rename from Telegram/SourceFiles/core/core_ui_integration.cpp rename to Telegram/SourceFiles/core/ui_integration.cpp index a8011bd4a..a878b9075 100644 --- a/Telegram/SourceFiles/core/core_ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "core/core_ui_integration.h" +#include "core/ui_integration.h" #include "core/local_url_handlers.h" #include "core/file_utilities.h" diff --git a/Telegram/SourceFiles/core/core_ui_integration.h b/Telegram/SourceFiles/core/ui_integration.h similarity index 98% rename from Telegram/SourceFiles/core/core_ui_integration.h rename to Telegram/SourceFiles/core/ui_integration.h index e52bbb2ed..b53c76aa7 100644 --- a/Telegram/SourceFiles/core/core_ui_integration.h +++ b/Telegram/SourceFiles/core/ui_integration.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "ui/ui_integration.h" +#include "ui/integration.h" namespace Core { diff --git a/Telegram/gyp/telegram/sources.txt b/Telegram/gyp/telegram/sources.txt index effb6c0ed..cabd89a56 100644 --- a/Telegram/gyp/telegram/sources.txt +++ b/Telegram/gyp/telegram/sources.txt @@ -144,8 +144,6 @@ <(src_loc)/core/core_cloud_password.h <(src_loc)/core/core_settings.cpp <(src_loc)/core/core_settings.h -<(src_loc)/core/core_ui_integration.cpp -<(src_loc)/core/core_ui_integration.h <(src_loc)/core/crash_report_window.cpp <(src_loc)/core/crash_report_window.h <(src_loc)/core/crash_reports.cpp @@ -163,6 +161,8 @@ <(src_loc)/core/sandbox.h <(src_loc)/core/shortcuts.cpp <(src_loc)/core/shortcuts.h +<(src_loc)/core/ui_integration.cpp +<(src_loc)/core/ui_integration.h <(src_loc)/core/update_checker.cpp <(src_loc)/core/update_checker.h <(src_loc)/core/utils.cpp diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 5b7ca43ba..34b05c25f 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 5b7ca43baf8c5ff3b1a65a09a458c599ac03e68d +Subproject commit 34b05c25fc5e0642506fc59f3d791973632d4248