diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a689d46b91..b4ec6f93d4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -88,9 +88,6 @@ jobs: DEFINE="" if [ -n "${{ matrix.defines }}" ]; then DEFINE="-D ${{ matrix.defines }}=ON" - if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_DBUS_INTEGRATION" ]; then - DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_WEBKITGTK=ON" - fi echo Define from matrix: $DEFINE echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV else diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp index 9db2ce6602..7994350eac 100644 --- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp @@ -9,10 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/crash_reports.h" #include "core/update_checker.h" - -#ifndef DESKTOP_APP_DISABLE_WEBKITGTK #include "webview/platform/linux/webview_linux_webkit2gtk.h" -#endif // !DESKTOP_APP_DISABLE_WEBKITGTK #include @@ -64,14 +61,12 @@ int Launcher::exec() { Gio::init(); #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION -#ifndef DESKTOP_APP_DISABLE_WEBKITGTK for (auto i = begin(_arguments), e = end(_arguments); i != e; ++i) { if (*i == "-webviewhelper" && std::distance(i, e) > 2) { Webview::WebKit2Gtk::SetServiceName(*(i + 2)); return Webview::WebKit2Gtk::Exec(*(i + 1)); } } -#endif // !DESKTOP_APP_DISABLE_WEBKITGTK return Core::Launcher::exec(); } diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index e81b14422b..325e464d0e 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/core_settings.h" #include "core/update_checker.h" #include "window/window_controller.h" +#include "webview/platform/linux/webview_linux_webkit2gtk.h" #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #include "base/platform/linux/base_linux_glibmm_helper.h" @@ -33,10 +34,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/platform/linux/base_linux_xsettings.h" #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION -#ifndef DESKTOP_APP_DISABLE_WEBKITGTK -#include "webview/platform/linux/webview_linux_webkit2gtk.h" -#endif // !DESKTOP_APP_DISABLE_WEBKITGTK - #include #include #include @@ -741,14 +738,12 @@ void start() { } #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION -#ifndef DESKTOP_APP_DISABLE_WEBKITGTK const auto d = QFile::encodeName(QDir(cWorkingDir()).absolutePath()); char h[33] = { 0 }; hashMd5Hex(d.constData(), d.size(), h); Webview::WebKit2Gtk::SetServiceName( kWebviewService.utf16().arg(h).arg("%1").toStdString()); -#endif // !DESKTOP_APP_DISABLE_WEBKITGTK } void finish() { diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 0a3584b8d8..7caea0cb01 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 0a3584b8d8e37f9745a0cb0fae725e8e8ea0d989 +Subproject commit 7caea0cb01b2170e00ded1e605dc9fa0e7b06fe7 diff --git a/cmake b/cmake index fc65d3305d..051f7ba4e3 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit fc65d3305db9c194979a44fb9b71d290b39b6f5a +Subproject commit 051f7ba4e38226797bafbd9c1ed52ef38afe28b9